Fix the integration tests