Making tests runnable on OSX
Merge pull request #4182 from zsimic/develop

Making tests runnable on OSX