Issue #28: Further clean-up of XML test output