TemplateTestSuite DTD cleanup
TemplateTestSuite streamlined for multi-IcI tests