Updated much more of the UserService + some unit tests