integration tests refactoring