fix more test failures.