Fixes xml-5 and xml-7 tests