Supprt OS X and unit tests for the OS