Bunch of changes to unit tests and users svc.