Fixed TestXPathExpressions (by changing XML resources).
Some preliminary housekeeping.