Small fixes to testing on MacOS X