Fix mac os x test failures