fix more flakey tests