fix more tests
fix most tests