Tests updated to run on MAC OS X