Merge "Refinements and test additions to XmlParser"