Trying to fix more failing tests