fix more test breakage