some refactoring of userservice
latest version of failing tests