refactoring service layer integration tests