Are you reverting @guillermo-carrasco's changes in this PR? Have you tried to run the tests on a Mac?