Trying to fix more broken tests.