Fixed unit tests for OS X