Fixing up OS X stuff. Fixed the test suite.