test files fixes
Merge branch 'master' into mac