Try to fix the unit-tests on OS X