Package/name refactoring of XPath tests