Fix unittests after mac
Revert pragma changes and tentative commit for mac os x