Fix XML tests
Fix XML tests2