Merge "Added unit tests for UserController"