M: XmlParser: lazy initialization replaced to on-demand initialization.
M: TestFramework: refactoring.