Fix some failing XML tests.

Change-Id: I7504e849b9fe67900248a2e223d189c8fcef224d
3 files changed