Merge pull request #363 from adamretter/develop

Further XQuery Update tests and some XPath test fixes