[FIX] XQuery, unit tests