Change XML tests to rely on xmlsimple
Merge branch 'master' into ci-enumerators