some test config fixes
Merge branch 'master' into pull-requests