refactored tests
heavy refactoring of userService tests