fix more complex tests