Fix userServiceTest and config file
Merge branch 'fix-unit-tests'