fix more broken tests
fix more tests