Expanded UserServiceTest + fixed bug