refactoring integration tests.