Multiple updates; added more XQuery based checks a number of tests, etc.