Rename the XML parser and clean up the test code