Fixed and added all unit tests for UserService