Refactored integration tests