Added missing config files
Merge branch 'testing'