Clean up the XML parser in the unit tests