Some integration test cleanup.