Updated UserService and tests.