fix more unit tests.