fix more tests, again