Change XML tests to rely on xmlsimple