fix
fix more tests