Simplify common code in XPath tests
Merge pull request #591 from sharwell/xpath-tests

Simplify common code in XPath tests