Updating all of the QA code that I can actually test to work with the new XML output...