Changes to make these tests work on the Mac.
3 files changed