Added one more test
Added builders in production environment. NB. As long as the time passes names may will change
Separating responsabilities
Other corrections
Refactored UserService
More builders