Update: more testing for Mac OSX