Moving test config to permanent home
Merge remote-tracking branch 'upstream/DR1-testing' into DR1-testing
Cleaning up test config files