Add required files
Merge branch 'test_config'