Merge "Update DFC tests to use file based conifg"