NO-SNOW: fix more test failures (#4299)