Added support for OSX tests