fix more tests.