fix another test
fix more tests