fix more unit tests
fix some more unit tests