XPathConvertor: moved/reordered tests