fixed failing mac tests
Merge branch 'master' into development