fix more unit tests