New changes to testcases and XmlGenerator interface