Adjusting unit tests for refactoring of services