Merge "UserController tests up"