fix more tests (46/67)