Better fix for tests on the Mac builders