Fix the integration-level tests.