fix more breaking tests