Fix userServiceTest
Merge branch 'fix-unit-tests'