Merge "More tests for UserController"