split and fix more tests