Added yet another fix to make the tests pass under MacOS X