Services unit tests refactoring