Os X Compatibility

These are the minimum changes I had to make in order to get the same results from unit testing with an OS X target that I get from an iOS target.