Added XML content tagging.  Didn't fix the failing tests.