better error messages for unit tests
Merge remote-tracking branch 'remotes/mblakele/roxy/test-error-messages' into dev

Conflicts:
	src/test/default.xqy