Integration test refactoring