fix more unit tests
fixed more unit tests