Tests updated for new OSX