Various tweaks to make the test work on the Mac.
1 file changed