Fixes xml and xml-2 tests