Fixed failing tests on mac