fix more integration tests