Move --config-dir tests into their own test case

For some reason these were in TemplateSubstitutionTestCase.

Change-Id: Ie2ce1a2a4fd20e5255434c5a5ccf4bc42a5e4beb
Merge "Move --config-dir tests into their own test case"