trying to fix more tests.