Improve coverage (UserRegistrationServiceTest) and slight refactoring