Merge pull request #162 from Smoss/master

More mac test fixes