WIP fix OS X unit tests