Add check for Mac OS X
Merge branch 'develop' of https://github.com/nesi/envtest into develop