Merge "UserTest: Fix edit count test which incorrectly added user to db"