Fix broken tests for Xml.