Integration test refactored