Merge lp:~zorba-coders/zorba/testsuites_update into lp:zorba

[Sorin Marian Nasoi]

- updated the import scripts to use the latest version of XQTS, XQUTS and XQFTTS as of 25.01.2012
- added EXPECTED_FAILURES for XQFTTS XQuery and XQueryX tests
- updated the W3C conformance documentation
- included fix for the XQFTTS XQueryX tests created by Daniel in lp:~zorba-coders/zorba/xqueryx_fulltext branch

- updated the import scripts to use the latest version of XQTS, XQUTS and XQFTTS as of 25.01.2012
- added EXPECTED_FAILURES for XQFTTS XQuery and XQueryX tests
- updated the W3C conformance documentation
- included fix for the XQFTTS XQueryX tests created by Daniel in lp:~zorba-coders/zorba/xqueryx_fulltext branch

[Sorin Marian Nasoi (sorin.marian.nasoi)]

review: Approve

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/testsuites_update-2012-01-26T01-45-00.946Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/testsuites_update into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job testsuites_update-2012-01-26T01-45-00.946Z is
  finished. The final status was:

  2 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Chris Hillery (ceejatec)]

FYI, the regressions for xqts-xquery and xqts-xqx are the same 6 tests:

REGRESSION:758:test/rbkt/w3c_testsuite/XQuery/FunctX/functx-fn-tokenize/functx-fn-tokenize-all
REGRESSION:762:test/rbkt/w3c_testsuite/XQuery/FunctX/functx-fn-tokenize/functx-fn-tokenize-7
REGRESSION:12127:test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/K2-MatchesFunc-5
REGRESSION:12131:test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch08
REGRESSION:12147:test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/K2-MatchesFunc-6
REGRESSION:12173:test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch09

[Chris Hillery (ceejatec)]

Out of curiousity, why are there additional regressions being added to the w3c_known_failures file with these changes? What changes in this merge would affect the results of running XQTS?

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/testsuites_update-2012-01-26T08-00-00.711Z/log.html

[Chris Hillery (ceejatec)]

Running validation queue again with XQFTTS enabled (forgot last time).

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/testsuites_update into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job testsuites_update-2012-01-26T08-00-00.711Z is
  finished. The final status was:

  2 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Chris Hillery (ceejatec)]

What I've figured out is the following:

1. The additional regressions and things I see are, I presume, the results of the newer version of XQTS. This was changed by Sorin in r10594. I thought that revision was already merged on the trunk, but evidently not.

2. The 6 regressions I reported above are ones that we've hit in the past - they appear to be failing on the validation queue machine, but not on most developer machines. In the past, we have more or less decided this is because the validation queue machine is running an older version of ICU that has certain bugs.

So, I have updated both known_failures files to add those 6 tests back in, and am approving this merge.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/testsuites_update-2012-01-26T09-03-19.173Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/testsuites_update into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job testsuites_update-2012-01-26T09-03-19.173Z is
  finished. The final status was:

  2 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[lp:~zorba-coders/zorba/testsuites_update]

10611. By Chris Hillery on 2012-01-26

Adding back 6 tests which still fail on the validation queue machine
(believed to be due to older ICU).

[Chris Hillery (ceejatec)]

Something went weird with my commit; trying again.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/testsuites_update-2012-01-26T09-43-05.268Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job testsuites_update-2012-01-26T09-43-05.268Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2012-01-25 10:48:43 +0000
+++ ChangeLog	2012-01-26 09:42:31 +0000
@@ -28,6 +28,8 @@
   * Added API method Item::getNamespaceBindings().
   * Added API method StaticContext::getNamespaceBindings() (see bug #905035)
   * Deprecated StaticContext:getNamespaceURIByPrefix()
+  * Fixed bug #918211 (xqueryx fulltext w3c conformance generation)
+  * Fixed bug #918157 (Add XQFTTS to validation queue)
 
 version 2.1
 
 
=== modified file 'doc/zorba/conformance.dox'
--- doc/zorba/conformance.dox	2011-09-06 16:39:46 +0000
+++ doc/zorba/conformance.dox	2012-01-26 09:42:31 +0000
@@ -344,18 +344,18 @@
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">Minimal Conformance</td>
-    <td align="center" bgcolor="palegreen">384/429<br />89.51%</td>
-    <td align="center" bgcolor="coral">24/429<br />5.59%</td>
+    <td align="center" bgcolor="palegreen">385/429<br />89.74%</td>
+    <td align="center" bgcolor="palegreen">374/429<br />87.18%</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">Optional Features</td>
     <td align="center" bgcolor="palegreen">106/125<br />84.8%</td>
-    <td align="center" bgcolor="coral">0/125<br />0%</td>
+    <td align="center" bgcolor="palegreen">97/125<br />77.6%</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">Use Cases</td>
     <td align="center" bgcolor="palegreen">121/135<br />89.63%</td>
-    <td align="center" bgcolor="coral">0/135<br />0%</td>
+    <td align="center" bgcolor="palegreen">103/135<br />76.3%</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">Consistency in XQFTTS Catalog</td>
 
=== modified file 'doc/zorba/conformanceXQFTTS.dox'
--- doc/zorba/conformanceXQFTTS.dox	2011-09-06 16:21:54 +0000
+++ doc/zorba/conformanceXQFTTS.dox	2012-01-26 09:42:31 +0000
@@ -1,8 +1,8 @@
 /** \page conformanceXQFTTS  W3C XQuery and XPath Full Text 1.0 Conformance
 
-Zorba achieves 89.51% on minimal conformance (and 84.8% on Optional Features) for the W3C XPath Full Text 1.0 Test Suite.
-Please see the table below for more details.
-
+ Zorba achieves 89.74% on minimal conformance (84.8% on Optional Features) for the W3C XPath Full Text 1.0 Test Suite.
+            
+Please see the table below for more details. 
 <table bgcolor="lightcyan">
   <tr>
     <td>W3C XQuery and XPath Full Text 1.0 features</td>
@@ -27,7 +27,7 @@
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 2.2.2</td>
     <td align="center" bgcolor="mediumseagreen">4/4</td>
-    <td align="center" bgcolor="coral">0/4</td>
+    <td align="center" bgcolor="mediumseagreen">4/4</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 2.3</td>
@@ -42,27 +42,27 @@
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 3.2</td>
     <td align="center" bgcolor="palegreen">4/5</td>
-    <td align="center" bgcolor="coral">0/5</td>
+    <td align="center" bgcolor="palegreen">4/5</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 3.3</td>
     <td align="center" bgcolor="mediumseagreen">2/2</td>
-    <td align="center" bgcolor="coral">0/2</td>
+    <td align="center" bgcolor="mediumseagreen">2/2</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 3.4</td>
     <td align="center" bgcolor="mediumseagreen">2/2</td>
-    <td align="center" bgcolor="coral">0/2</td>
+    <td align="center" bgcolor="mediumseagreen">2/2</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 3.4.1</td>
     <td align="center" bgcolor="mediumseagreen">1/1</td>
-    <td align="center" bgcolor="coral">0/1</td>
+    <td align="center" bgcolor="mediumseagreen">1/1</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 3.4.2</td>
     <td align="center" bgcolor="mediumseagreen">4/4</td>
-    <td align="center" bgcolor="coral">0/4</td>
+    <td align="center" bgcolor="mediumseagreen">4/4</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 3.4.3</td>
@@ -72,77 +72,77 @@
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 3.4.4</td>
     <td align="center" bgcolor="mediumseagreen">2/2</td>
-    <td align="center" bgcolor="coral">0/2</td>
+    <td align="center" bgcolor="mediumseagreen">2/2</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 3.4.5</td>
     <td align="center" bgcolor="mediumseagreen">2/2</td>
-    <td align="center" bgcolor="coral">0/2</td>
+    <td align="center" bgcolor="mediumseagreen">2/2</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 3.4.6</td>
     <td align="center" bgcolor="mediumseagreen">2/2</td>
-    <td align="center" bgcolor="coral">0/2</td>
+    <td align="center" bgcolor="mediumseagreen">2/2</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 3.4.7</td>
     <td align="center" bgcolor="mediumseagreen">5/5</td>
-    <td align="center" bgcolor="coral">0/5</td>
+    <td align="center" bgcolor="mediumseagreen">5/5</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 3.4.8</td>
     <td align="center" bgcolor="mediumseagreen">2/2</td>
-    <td align="center" bgcolor="coral">0/2</td>
+    <td align="center" bgcolor="mediumseagreen">2/2</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 3.5.1</td>
     <td align="center" bgcolor="mediumseagreen">1/1</td>
-    <td align="center" bgcolor="coral">0/1</td>
+    <td align="center" bgcolor="mediumseagreen">1/1</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 3.5.2</td>
     <td align="center" bgcolor="mediumseagreen">2/2</td>
-    <td align="center" bgcolor="coral">0/2</td>
+    <td align="center" bgcolor="mediumseagreen">2/2</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 3.5.3</td>
     <td align="center" bgcolor="mediumseagreen">1/1</td>
-    <td align="center" bgcolor="coral">0/1</td>
+    <td align="center" bgcolor="mediumseagreen">1/1</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 3.5.4</td>
     <td align="center" bgcolor="mediumseagreen">3/3</td>
-    <td align="center" bgcolor="coral">0/3</td>
+    <td align="center" bgcolor="mediumseagreen">3/3</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 3.6.1</td>
     <td align="center" bgcolor="mediumseagreen">2/2</td>
-    <td align="center" bgcolor="coral">0/2</td>
+    <td align="center" bgcolor="mediumseagreen">2/2</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 3.6.2</td>
     <td align="center" bgcolor="palegreen">5/6</td>
-    <td align="center" bgcolor="coral">0/6</td>
+    <td align="center" bgcolor="palegreen">5/6</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 3.6.3</td>
     <td align="center" bgcolor="mediumseagreen">5/5</td>
-    <td align="center" bgcolor="coral">0/5</td>
+    <td align="center" bgcolor="mediumseagreen">5/5</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 3.6.4</td>
     <td align="center" bgcolor="mediumseagreen">6/6</td>
-    <td align="center" bgcolor="coral">0/6</td>
+    <td align="center" bgcolor="mediumseagreen">6/6</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 3.6.5</td>
     <td align="center" bgcolor="mediumseagreen">4/4</td>
-    <td align="center" bgcolor="coral">0/4</td>
+    <td align="center" bgcolor="mediumseagreen">4/4</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">    Section 3.7</td>
     <td align="center" bgcolor="mediumseagreen">1/1</td>
-    <td align="center" bgcolor="coral">0/1</td>
+    <td align="center" bgcolor="mediumseagreen">1/1</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="paleturquoise">  Expressions</td>
@@ -187,12 +187,12 @@
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">            Full-Text Tokens and Phrases</td>
     <td align="center" bgcolor="palegreen">66/68</td>
-    <td align="center" bgcolor="coral">2/68</td>
+    <td align="center" bgcolor="mediumseagreen">68/68</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">            Full-Text Cardinality Selection</td>
     <td align="center" bgcolor="mediumseagreen">20/20</td>
-    <td align="center" bgcolor="coral">0/20</td>
+    <td align="center" bgcolor="mediumseagreen">20/20</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="paleturquoise">            Full-Text Operators</td>
@@ -202,67 +202,67 @@
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">              Full-Text ftor Operator</td>
     <td align="center" bgcolor="mediumseagreen">15/15</td>
-    <td align="center" bgcolor="coral">2/15</td>
+    <td align="center" bgcolor="mediumseagreen">15/15</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">              Full-Text ftand Operator</td>
     <td align="center" bgcolor="mediumseagreen">11/11</td>
-    <td align="center" bgcolor="coral">2/11</td>
+    <td align="center" bgcolor="mediumseagreen">11/11</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">              Full-Text ftnot Operator</td>
     <td align="center" bgcolor="mediumseagreen">7/7</td>
-    <td align="center" bgcolor="coral">0/7</td>
+    <td align="center" bgcolor="mediumseagreen">7/7</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">              Full-Text not in Operator</td>
     <td align="center" bgcolor="mediumseagreen">11/11</td>
-    <td align="center" bgcolor="coral">0/11</td>
+    <td align="center" bgcolor="mediumseagreen">11/11</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">              Full-text Match Options</td>
     <td align="center" bgcolor="mediumseagreen">6/6</td>
-    <td align="center" bgcolor="coral">0/6</td>
+    <td align="center" bgcolor="palegreen">4/6</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">              Full-Text Language Match Option</td>
     <td align="center" bgcolor="mediumseagreen">4/4</td>
-    <td align="center" bgcolor="coral">0/4</td>
+    <td align="center" bgcolor="mediumseagreen">4/4</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">              Full-Text Wildcard Match Option</td>
     <td align="center" bgcolor="mediumseagreen">21/21</td>
-    <td align="center" bgcolor="coral">0/21</td>
+    <td align="center" bgcolor="mediumseagreen">21/21</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">              Full-Text Thesaurus Match Option</td>
-    <td align="center" bgcolor="palegreen">9/10</td>
-    <td align="center" bgcolor="palegreen">4/10</td>
+    <td align="center" bgcolor="mediumseagreen">10/10</td>
+    <td align="center" bgcolor="palegreen">7/10</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">              Full-Text Stemming Match Option</td>
     <td align="center" bgcolor="mediumseagreen">5/5</td>
-    <td align="center" bgcolor="coral">0/5</td>
+    <td align="center" bgcolor="mediumseagreen">5/5</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">              Full-Text Case Match Option</td>
     <td align="center" bgcolor="mediumseagreen">6/6</td>
-    <td align="center" bgcolor="coral">0/6</td>
+    <td align="center" bgcolor="mediumseagreen">6/6</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">              Full-Text Diacritics Match Option</td>
     <td align="center" bgcolor="mediumseagreen">4/4</td>
-    <td align="center" bgcolor="coral">0/4</td>
+    <td align="center" bgcolor="mediumseagreen">4/4</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">              Full-Text Stop Word Match Option.</td>
     <td align="center" bgcolor="mediumseagreen">10/10</td>
-    <td align="center" bgcolor="coral">0/10</td>
+    <td align="center" bgcolor="palegreen">5/10</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">              Full-Text Extension Option</td>
     <td align="center" bgcolor="mediumseagreen">3/3</td>
-    <td align="center" bgcolor="coral">0/3</td>
+    <td align="center" bgcolor="mediumseagreen">3/3</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="paleturquoise">            Full-Text Positional Filters</td>
@@ -272,27 +272,27 @@
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">              Ordered Selection</td>
     <td align="center" bgcolor="mediumseagreen">6/6</td>
-    <td align="center" bgcolor="coral">0/6</td>
+    <td align="center" bgcolor="mediumseagreen">6/6</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">              Window Selection</td>
     <td align="center" bgcolor="mediumseagreen">21/21</td>
-    <td align="center" bgcolor="coral">3/21</td>
+    <td align="center" bgcolor="mediumseagreen">21/21</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">              Distance Selection</td>
     <td align="center" bgcolor="mediumseagreen">33/33</td>
-    <td align="center" bgcolor="coral">2/33</td>
+    <td align="center" bgcolor="mediumseagreen">33/33</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">              Scope Selection</td>
     <td align="center" bgcolor="palegreen">10/19</td>
-    <td align="center" bgcolor="coral">0/19</td>
+    <td align="center" bgcolor="palegreen">10/19</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">              Anchoring Selection</td>
     <td align="center" bgcolor="mediumseagreen">10/10</td>
-    <td align="center" bgcolor="coral">0/10</td>
+    <td align="center" bgcolor="mediumseagreen">10/10</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">            Full-Text FTSelection weight</td>
@@ -302,12 +302,12 @@
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">          Full-Text Ignore</td>
     <td align="center" bgcolor="mediumseagreen">5/5</td>
-    <td align="center" bgcolor="coral">0/5</td>
+    <td align="center" bgcolor="mediumseagreen">5/5</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">          Full-Text Extension Selections</td>
     <td align="center" bgcolor="mediumseagreen">6/6</td>
-    <td align="center" bgcolor="palegreen">4/6</td>
+    <td align="center" bgcolor="mediumseagreen">6/6</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="paleturquoise">Optional Features</td>
@@ -317,67 +317,67 @@
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Full-Text not in Operator</td>
     <td align="center" bgcolor="mediumseagreen">9/9</td>
-    <td align="center" bgcolor="coral">0/9</td>
+    <td align="center" bgcolor="mediumseagreen">9/9</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Unconstrained Full-Text ftnot Operator</td>
     <td align="center" bgcolor="mediumseagreen">5/5</td>
-    <td align="center" bgcolor="coral">0/5</td>
+    <td align="center" bgcolor="mediumseagreen">5/5</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Unconstrained FTUnit/FTBigUnit</td>
     <td align="center" bgcolor="mediumseagreen">18/18</td>
-    <td align="center" bgcolor="coral">0/18</td>
+    <td align="center" bgcolor="mediumseagreen">18/18</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Unconstrained Order Selection</td>
     <td align="center" bgcolor="mediumseagreen">5/5</td>
-    <td align="center" bgcolor="coral">0/5</td>
+    <td align="center" bgcolor="mediumseagreen">5/5</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Scope Selection</td>
     <td align="center" bgcolor="mediumseagreen">10/10</td>
-    <td align="center" bgcolor="coral">0/10</td>
+    <td align="center" bgcolor="mediumseagreen">10/10</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Unconstrained Window Selection</td>
     <td align="center" bgcolor="palegreen">4/5</td>
-    <td align="center" bgcolor="coral">0/5</td>
+    <td align="center" bgcolor="palegreen">4/5</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Unconstrained Distance Selection</td>
     <td align="center" bgcolor="mediumseagreen">5/5</td>
-    <td align="center" bgcolor="coral">0/5</td>
+    <td align="center" bgcolor="mediumseagreen">5/5</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Full-Text Cardinality Selection</td>
     <td align="center" bgcolor="mediumseagreen">20/20</td>
-    <td align="center" bgcolor="coral">0/20</td>
+    <td align="center" bgcolor="mediumseagreen">20/20</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Anchoring Selection</td>
     <td align="center" bgcolor="mediumseagreen">5/5</td>
-    <td align="center" bgcolor="coral">0/5</td>
+    <td align="center" bgcolor="mediumseagreen">5/5</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Unconstrained Full-Text Case Option</td>
     <td align="center" bgcolor="mediumseagreen">4/4</td>
-    <td align="center" bgcolor="coral">0/4</td>
+    <td align="center" bgcolor="mediumseagreen">4/4</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Unconstrained Full-Text Stop Word Option</td>
     <td align="center" bgcolor="mediumseagreen">14/14</td>
-    <td align="center" bgcolor="coral">0/14</td>
+    <td align="center" bgcolor="palegreen">5/14</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Unconstrained Full-Text Language Option</td>
     <td align="center" bgcolor="mediumseagreen">2/2</td>
-    <td align="center" bgcolor="coral">0/2</td>
+    <td align="center" bgcolor="mediumseagreen">2/2</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Unconstrained Ignore Option</td>
     <td align="center" bgcolor="mediumseagreen">5/5</td>
-    <td align="center" bgcolor="coral">0/5</td>
+    <td align="center" bgcolor="mediumseagreen">5/5</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Unconstrained Scoring</td>
@@ -402,27 +402,27 @@
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Use Case "ELEMENT"</td>
     <td align="center" bgcolor="mediumseagreen">11/11</td>
-    <td align="center" bgcolor="coral">0/11</td>
+    <td align="center" bgcolor="mediumseagreen">11/11</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Use Case "ACROSS"</td>
     <td align="center" bgcolor="palegreen">9/10</td>
-    <td align="center" bgcolor="coral">0/10</td>
+    <td align="center" bgcolor="palegreen">9/10</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Use Case "OTHER"</td>
     <td align="center" bgcolor="mediumseagreen">3/3</td>
-    <td align="center" bgcolor="coral">0/3</td>
+    <td align="center" bgcolor="mediumseagreen">3/3</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Use Case "WILDCARD"</td>
     <td align="center" bgcolor="mediumseagreen">10/10</td>
-    <td align="center" bgcolor="coral">0/10</td>
+    <td align="center" bgcolor="mediumseagreen">10/10</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Use Case "STEMMING"</td>
     <td align="center" bgcolor="mediumseagreen">4/4</td>
-    <td align="center" bgcolor="coral">0/4</td>
+    <td align="center" bgcolor="mediumseagreen">4/4</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Use Case "THESAURUS"</td>
@@ -432,47 +432,47 @@
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Use Case "STOP-WORD"</td>
     <td align="center" bgcolor="mediumseagreen">6/6</td>
-    <td align="center" bgcolor="coral">0/6</td>
+    <td align="center" bgcolor="palegreen">2/6</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Use Case "CHARACTER"</td>
     <td align="center" bgcolor="mediumseagreen">8/8</td>
-    <td align="center" bgcolor="coral">0/8</td>
+    <td align="center" bgcolor="mediumseagreen">8/8</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Use Case "LOGICAL"</td>
     <td align="center" bgcolor="mediumseagreen">14/14</td>
-    <td align="center" bgcolor="coral">0/14</td>
+    <td align="center" bgcolor="mediumseagreen">14/14</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Use Case "CARDINALITY"</td>
     <td align="center" bgcolor="mediumseagreen">8/8</td>
-    <td align="center" bgcolor="coral">0/8</td>
+    <td align="center" bgcolor="mediumseagreen">8/8</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Use Case "PROXIMITY"</td>
     <td align="center" bgcolor="mediumseagreen">10/10</td>
-    <td align="center" bgcolor="coral">0/10</td>
+    <td align="center" bgcolor="mediumseagreen">10/10</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Use Case "AXES"</td>
     <td align="center" bgcolor="mediumseagreen">7/7</td>
-    <td align="center" bgcolor="coral">0/7</td>
+    <td align="center" bgcolor="mediumseagreen">7/7</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Use Case "IGNORE"</td>
     <td align="center" bgcolor="palegreen">5/8</td>
-    <td align="center" bgcolor="coral">0/8</td>
+    <td align="center" bgcolor="palegreen">5/8</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Use Case "FULL-TEXT-COMPOSABILITY"</td>
     <td align="center" bgcolor="palegreen">6/7</td>
-    <td align="center" bgcolor="coral">0/7</td>
+    <td align="center" bgcolor="palegreen">4/7</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Use Case "XQUERY-XPATH-COMPOSABILITY"</td>
     <td align="center" bgcolor="palegreen">8/10</td>
-    <td align="center" bgcolor="coral">0/10</td>
+    <td align="center" bgcolor="palegreen">8/10</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td bgcolor="lightcyan">  Use Case "SCORE"</td>
 
=== modified file 'scripts/sanity_checks/README.txt'
--- scripts/sanity_checks/README.txt	2011-10-07 08:28:43 +0000
+++ scripts/sanity_checks/README.txt	2012-01-26 09:42:31 +0000
@@ -2,7 +2,7 @@
 - /tmp/XQTS_current/conformanceXQTS.dox
 - /tmp/XQTS_current/conformanceXQTSSummary.dox
 Note: this takes quite a long time because there are over 28000 tests to be processed(14000 XQuery and the same for XQueryX)
-Also there are over 580 XQueryX tests for wich there are no results reported in the submission XML.
+Also there are over 580 XQueryX tests for which there are no results reported in the submission XML.
 
 The command ./zorba -f -q /tmp/XQTS_current/run_xquts.xq generates:
 - /tmp/XQUTS_current/conformanceXQUTS.dox
@@ -20,4 +20,4 @@
 
 generate_implementation_defined_features_dox.xq
 Run it in order to generate the docygen page:
-./zorba --indent -z method=xml --omit-xml-declaration -f -q ../../scripts/sanity_checks/generate_implementation_defined_features_dox.xq > ../../doc/zorba/impl_dep_features.dox
 \ No newline at end of file
+./zorba --indent -z method=xml --omit-xml-declaration -f -q ../../scripts/sanity_checks/generate_implementation_defined_features_dox.xq > ../../doc/zorba/impl_dep_features.dox
 
=== modified file 'scripts/sanity_checks/conformance_xqftts.xqi'
--- scripts/sanity_checks/conformance_xqftts.xqi	2011-09-06 19:24:13 +0000
+++ scripts/sanity_checks/conformance_xqftts.xqi	2012-01-26 09:42:31 +0000
@@ -50,9 +50,9 @@
   
 declare %private variable $conf:XQFTTS_PATH  as xs:string := "/tmp/XQFTTS_current";
 declare %private variable $conf:XQFTTS_submission as xs:string := 
-"/tmp/XQFTTS_current/ReportingResults/zorba_11674_xqftts_current.xml";
+"/tmp/XQFTTS_current/ReportingResults/zorba_xqftts_submission.xml";
 declare %private variable $conf:XQFTTSX_submission as xs:string := 
-"/tmp/XQFTTS_current/ReportingResults/zorba_11674_xqfttsx_current.xml";
+"/tmp/XQFTTS_current/ReportingResults/zorba_xqfttsx_submission.xml";
 
 declare %private variable $conf:XQuery   as xs:string := "XQuery";
 declare %private variable $conf:XQueryX  as xs:string := "XQueryX";
@@ -397,11 +397,11 @@
             ") for the W3C XPath Full Text 1.0 Test Suite.
             
 Please see the table below for more details.")
-")
+
 };
 
 declare %ann:sequential function conf:test()
-{  
+{
   variable $XQTS_catalog := fn:parse-xml(file:read-text(file:resolve-path(concat($conf:XQFTTS_PATH,file:directory-separator(),"XQFTTSCatalog.xml"))));
   
   conf:create-collection($conf:XQuery, $XQTS_catalog);
@@ -435,5 +435,4 @@
 ,"
 */"), 
              $conf:serParamXhtml);
-
 };
 
=== modified file 'scripts/sanity_checks/conformance_xqts.xqi'
--- scripts/sanity_checks/conformance_xqts.xqi	2011-09-06 19:24:13 +0000
+++ scripts/sanity_checks/conformance_xqts.xqi	2012-01-26 09:42:31 +0000
@@ -56,9 +56,9 @@
   
 declare %private variable $conf:XQTS_PATH  as xs:string := "/tmp/XQTS_current";
 declare %private variable $conf:XQTS_submission as xs:string := 
-        "/tmp/XQTS_current/ReportingResults/zorba_11674_xqts_current_xquery_1_0.xml";
+        "/tmp/XQTS_current/ReportingResults/zorba_xqts_submission.xml";
 declare %private variable $conf:XQTSX_submission as xs:string := 
-        "/tmp/XQTS_current/ReportingResults/zorba_11674_xqtsx_current_xquery_1_0.xml";
+        "/tmp/XQTS_current/ReportingResults/zorba_xqtsx_submission.xml";
 
 declare %private variable $conf:XQuery   as xs:string := "XQuery";
 declare %private variable $conf:XQueryX  as xs:string := "XQueryX";
@@ -421,7 +421,7 @@
             ") for the W3C XML Query Test Suite.
             
 Please see the table below for more details.")
-")
+
 };
 
 declare %ann:sequential function conf:test()
 
=== modified file 'src/compiler/xqueryx/xqueryx_to_xquery.cpp'
--- src/compiler/xqueryx/xqueryx_to_xquery.cpp	2011-09-05 20:08:30 +0000
+++ src/compiler/xqueryx/xqueryx_to_xquery.cpp	2012-01-26 09:42:31 +0000
@@ -53,7 +53,10 @@
   if(!inited)
   {
     xmlDocPtr doc;
-    doc = xmlParseDoc((xmlChar*)xqueryx_update_xslt);
+    std::string xqueryx_full_xslt;
+    xqueryx_full_xslt += xqueryx3_0_update_xslt;
+    xqueryx_full_xslt += xqueryx_fulltext_xslt;
+    doc = xmlParseDoc((xmlChar*)xqueryx_full_xslt.c_str());
 
     xqueryx_xslt = (xsltStylesheet*)xsltParseStylesheetDoc(doc);
   //	xmlFreeDoc(doc);
 
=== modified file 'src/compiler/xqueryx/xqueryx_xslt.cpp'
--- src/compiler/xqueryx/xqueryx_xslt.cpp	2011-07-07 07:20:10 +0000
+++ src/compiler/xqueryx/xqueryx_xslt.cpp	2012-01-26 09:42:31 +0000
@@ -23,9 +23,11 @@
 
 namespace zorba {
 
-//XQueryX 3.0 (draft 14 june 2011)  http://www.w3.org/TR/xqueryx-30/#Stylesheet
+//XQueryX 3.0 (draft 13 december 2011)  http://www.w3.org/TR/xqueryx-30/#Stylesheet
+//XQueryX update 1.0
+//XQueryX full text http://www.w3.org/TR/xpath-full-text-10/#id-xqft-xqueryx
 
-const char xqueryx_update_xslt[] = 
+const char xqueryx3_0_update_xslt[] = 
 "<?xml version=\"1.0\"?>"
 "<!-- ================================================================================ -->"
 "<!-- Changes from Recommendation (edition 1): -->"
@@ -75,13 +77,22 @@
 "<!-- 2011-05-04 - Updated structure of catch component of try-catch expression -->"
 "<!-- 2011-05-04 - Updated validationexpr, mode/type alternatives, type is EQName -->"
 "<!-- 2011-05-31 - Fixed functionItemExpr and functionCallExpr re: unqualified names -->"
+"<!-- 2011-07-08 - Added support for concatenation operator || -->"
+"<!-- 2011-09-09 - Added support for simple mapping operator ! -->"
+"<!-- 2011-09-09 - Added support for sequenceTypeUnion in typeswitch -->"
+"<!-- 2011-09-09 - Added support for annotations on inline functions -->"
+"<!-- 2011-09-14 - Added support for new group-by syntax -->"
+"<!-- 2011-11-21 - Jim changed \"literalFunctionItemExpr\" to \"namedFunctionRef\" -->"
+"<!-- 2011-11-21 - Jim changed \"inlineFunctionItemExpr\" to \"inlineFunctionExpr\" -->"
 "<!-- ================================================================================ -->"
 "<xsl:stylesheet version=\"1.0\""
 " xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\""
 " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
 " xmlns:xqx=\"http://www.w3.org/2005/XQueryX\""
-" xmlns:xqxuf=\"http://www.w3.org/2007/xquery-update-10\">"
-"<!-- Note that this stylesheet frequently invokes templates for"
+" xmlns:xqxuf=\"http://www.w3.org/2007/xquery-update-10\""
+" xmlns:xqxft=\"http://www.w3.org/2007/xpath-full-text\""
+" >"
+" <!-- Note that this stylesheet frequently invokes templates for"
 " specified elements, even when there are no templates in the"
 " stylesheet whose match=\"\" attribute identifies those elements."
 " In such case, the default template's element matching template"
@@ -98,14 +109,22 @@
 " <xsl:variable name=\"GREATERTHAN\" select=\"'&gt;'\"/>"
 " <xsl:variable name=\"LPAREN\" select=\"'('\"/>"
 " <xsl:variable name=\"RPAREN\" select=\"')'\"/>"
-" <xsl:variable name=\"NEWLINE\"><xsl:text>"
-"</xsl:text></xsl:variable>"
+" <xsl:variable name=\"NEWLINE\">"
+" <xsl:text>"
+" </xsl:text><!--my fix-->"
+" </xsl:variable>"
 " <xsl:variable name=\"COMMA\" select=\"','\"/>"
 " <xsl:variable name=\"COMMA_SPACE\" select=\"', '\"/>"
-" <xsl:variable name=\"COMMA_NEWLINE\"><xsl:text>,"
-"</xsl:text></xsl:variable>"
-" <xsl:variable name=\"QUOTE\"><xsl:text>'</xsl:text></xsl:variable>"
-" <xsl:variable name=\"DOUBLEQUOTE\"><xsl:text>\"</xsl:text></xsl:variable>"
+" <xsl:variable name=\"COMMA_NEWLINE\">"
+" <xsl:text>,"
+"</xsl:text>"
+" </xsl:variable>"
+" <xsl:variable name=\"QUOTE\">"
+" <xsl:text>'</xsl:text>"
+" </xsl:variable>"
+" <xsl:variable name=\"DOUBLEQUOTE\">"
+" <xsl:text>\"</xsl:text>"
+" </xsl:variable>"
 " <xsl:variable name=\"TO\" select=\"' to '\"/>"
 " <xsl:variable name=\"LBRACE\" select=\"'{'\"/>"
 " <xsl:variable name=\"RBRACE\" select=\"'}'\"/>"
@@ -121,11 +140,13 @@
 " <xsl:variable name=\"AT\" select=\"'@'\"/>"
 " <xsl:variable name=\"STAR\" select=\"'*'\"/>"
 " <xsl:variable name=\"QUESTIONMARK\" select=\"'?'\"/>"
+" <xsl:variable name=\"EXCLAMATIONMARK\" select=\"'!'\"/>"
 " <xsl:variable name=\"PERCENT\" select=\"'%'\"/>"
 " <xsl:variable name=\"ASSIGN\" select=\"':='\"/>"
 " <xsl:variable name=\"SEPARATOR\" select=\"';'\"/>"
 " <xsl:variable name=\"PRAGMA_BEGIN\" select=\"'(# '\"/>"
 " <xsl:variable name=\"PRAGMA_END\" select=\"' #)'\"/>"
+" <xsl:variable name=\"CONCATENATE\" select=\"'||'\"/>"
 " <xsl:template name=\"delimitedList\">"
 " <xsl:param name=\"delimiter\" />"
 " <xsl:param name=\"leftEncloser\"/>"
@@ -134,12 +155,12 @@
 " <xsl:value-of select=\"$leftEncloser\"/>"
 " <xsl:for-each select=\"*\">"
 " <xsl:apply-templates select=\".\"/>"
-" <xsl:if test=\"not (position()=last())\"> "
+" <xsl:if test=\"not (position()=last())\">"
 " <xsl:value-of select=\"$delimiter\"/>"
-" </xsl:if> "
+" </xsl:if>"
 " </xsl:for-each>"
 " <xsl:value-of select=\"$rightEncloser\"/>"
-" </xsl:template> "
+" </xsl:template>"
 " <xsl:template name=\"parenthesizedList\">"
 " <xsl:param name=\"delimiter\" select=\"$COMMA_SPACE\"/>"
 " <xsl:call-template name=\"delimitedList\">"
@@ -199,8 +220,12 @@
 " <xsl:with-param name=\"replacement\">&amp;#x2028;</xsl:with-param>"
 " </xsl:call-template>"
 " </xsl:with-param>"
-" <xsl:with-param name=\"toBeReplaced\"><xsl:text>\"</xsl:text></xsl:with-param>"
-" <xsl:with-param name=\"replacement\"><xsl:text>\"\"</xsl:text></xsl:with-param>"
+" <xsl:with-param name=\"toBeReplaced\">"
+" <xsl:text>\"</xsl:text>"
+" </xsl:with-param>"
+" <xsl:with-param name=\"replacement\">"
+" <xsl:text>\"\"</xsl:text>"
+" </xsl:with-param>"
 " </xsl:call-template>"
 " <xsl:value-of select=\"$DOUBLEQUOTE\"/>"
 " </xsl:template>"
@@ -280,7 +305,7 @@
 " <xsl:template match=\"xqx:rootExpr\">"
 " <xsl:value-of select=\"$SLASH\"/>"
 " </xsl:template>"
-"<!-- 2010-06-23 - Added support for partial function application -->"
+" <!-- 2010-06-23 - Added support for partial function application -->"
 " <xsl:template match=\"xqx:argumentPlaceholder\">"
 " <xsl:value-of select=\"$QUESTIONMARK\"/>"
 " </xsl:template>"
@@ -293,13 +318,13 @@
 " rootExpr is a stepExpr, then the parens must be"
 " omitted. -->"
 " <xsl:template match=\"xqx:pathExpr/xqx:rootExpr\">"
-" <xsl:if test=\"not(following-sibling::xqx:stepExpr)\">"
+" <xsl:if test=\"not(following-sibling::xqx:stepExpr or following-sibling::xqx:mapStepExpr)\">"
 " <xsl:value-of select=\"$LPAREN\"/>"
 " </xsl:if>"
 " <xsl:value-of select=\"$SPACE\"/>"
 " <xsl:value-of select=\"$SLASH\"/>"
 " <xsl:value-of select=\"$SPACE\"/>"
-" <xsl:if test=\"not(following-sibling::xqx:stepExpr)\">"
+" <xsl:if test=\"not(following-sibling::xqx:stepExpr or following-sibling::xqx:mapStepExpr)\">"
 " <xsl:value-of select=\"$RPAREN\"/>"
 " </xsl:if>"
 " </xsl:template>"
@@ -333,8 +358,8 @@
 " <xsl:apply-templates select=\"xqx:argExpr\"/>"
 " <xsl:value-of select=\"$RBRACE\"/>"
 " </xsl:template>"
-"<!-- Response to Bugzilla bug #2528 -->"
-"<!-- Response to Bugzilla bug #12788 -->"
+" <!-- Response to Bugzilla bug #2528 -->"
+" <!-- Response to Bugzilla bug #12788 -->"
 " <xsl:template match=\"xqx:functionCallExpr\">"
 " <xsl:if test=\"(xqx:functionName = 'node' or"
 " xqx:functionName = 'document-node' or"
@@ -355,8 +380,14 @@
 " ((not(xqx:functionName/@xqx:prefix) and not(xqx:functionName/@xqx:URI)) or"
 " xqx:functionName/@xqx:prefix = '' or"
 " xqx:functionName/@xqx:URI = '')\">"
-" <xsl:variable name=\"message\"><xsl:text>Incorrect XQueryX: function calls must not use unqualified \"reserved\" name \"</xsl:text><xsl:value-of select=\"xqx:functionName\"/><xsl:text>\"</xsl:text></xsl:variable>"
-" <xsl:message terminate=\"yes\"><xsl:value-of select=\"$message\"/></xsl:message>"
+" <xsl:variable name=\"message\">"
+" <xsl:text>Incorrect XQueryX: function calls must not use unqualified \"reserved\" name \"</xsl:text>"
+" <xsl:value-of select=\"xqx:functionName\"/>"
+" <xsl:text>\"</xsl:text>"
+" </xsl:variable>"
+" <xsl:message terminate=\"yes\">"
+" <xsl:value-of select=\"$message\"/>"
+" </xsl:message>"
 " </xsl:if>"
 " <xsl:apply-templates select=\"xqx:functionName\"/>"
 " <xsl:choose>"
@@ -380,8 +411,12 @@
 " <xsl:template match=\"xqx:unaryMinusOp | xqx:unaryPlusOp\">"
 " <xsl:value-of select=\"$LPAREN\"/>"
 " <xsl:choose>"
-" <xsl:when test=\"self::xqx:unaryPlusOp\"><xsl:value-of select=\"$PLUS\"/></xsl:when>"
-" <xsl:when test=\"self::xqx:unaryMinusOp\"><xsl:value-of select=\"$MINUS\"/></xsl:when>"
+" <xsl:when test=\"self::xqx:unaryPlusOp\">"
+" <xsl:value-of select=\"$PLUS\"/>"
+" </xsl:when>"
+" <xsl:when test=\"self::xqx:unaryMinusOp\">"
+" <xsl:value-of select=\"$MINUS\"/>"
+" </xsl:when>"
 " </xsl:choose>"
 " <xsl:apply-templates select=\"xqx:operand\"/>"
 " <xsl:value-of select=\"$RPAREN\"/>"
@@ -391,27 +426,60 @@
 " <xsl:value-of select=\"$LPAREN\"/>"
 " <xsl:apply-templates select=\"xqx:firstOperand\"/>"
 " <xsl:choose>"
-" <xsl:when test=\"self::xqx:addOp\"><xsl:value-of select=\"$PLUS\"/></xsl:when>"
-" <xsl:when test=\"self::xqx:subtractOp\"><xsl:text> </xsl:text><xsl:value-of select=\"$MINUS\"/><xsl:text> </xsl:text></xsl:when>"
-" <xsl:when test=\"self::xqx:multiplyOp\"><xsl:value-of select=\"$STAR\"/></xsl:when>"
-" <xsl:when test=\"self::xqx:divOp\"><xsl:text> div </xsl:text></xsl:when>"
-" <xsl:when test=\"self::xqx:idivOp\"><xsl:text> idiv </xsl:text></xsl:when>"
-" <xsl:when test=\"self::xqx:modOp\"><xsl:text> mod </xsl:text></xsl:when>"
+" <xsl:when test=\"self::xqx:addOp\">"
+" <xsl:value-of select=\"$PLUS\"/>"
+" </xsl:when>"
+" <xsl:when test=\"self::xqx:subtractOp\">"
+" <xsl:text> </xsl:text>"
+" <xsl:value-of select=\"$MINUS\"/>"
+" <xsl:text> </xsl:text>"
+" </xsl:when>"
+" <xsl:when test=\"self::xqx:multiplyOp\">"
+" <xsl:value-of select=\"$STAR\"/>"
+" </xsl:when>"
+" <xsl:when test=\"self::xqx:divOp\">"
+" <xsl:text> div </xsl:text>"
+" </xsl:when>"
+" <xsl:when test=\"self::xqx:idivOp\">"
+" <xsl:text> idiv </xsl:text>"
+" </xsl:when>"
+" <xsl:when test=\"self::xqx:modOp\">"
+" <xsl:text> mod </xsl:text>"
+" </xsl:when>"
 " </xsl:choose>"
 " <xsl:apply-templates select=\"xqx:secondOperand\"/>"
 " <xsl:value-of select=\"$RPAREN\"/>"
 " </xsl:template>"
+" <xsl:template match=\"xqx:stringConcatenateOp\">"
+" <xsl:value-of select=\"$LPAREN\"/>"
+" <xsl:apply-templates select=\"xqx:firstOperand\"/>"
+" <xsl:value-of select=\"$CONCATENATE\"/>"
+" <xsl:apply-templates select=\"xqx:secondOperand\"/>"
+" <xsl:value-of select=\"$RPAREN\"/>"
+" </xsl:template>"
 " <xsl:template match=\"xqx:eqOp | xqx:neOp | xqx:ltOp"
 " | xqx:gtOp | xqx:leOp | xqx:geOp\">"
 " <xsl:value-of select=\"$LPAREN\"/>"
 " <xsl:apply-templates select=\"xqx:firstOperand\"/>"
 " <xsl:choose>"
-" <xsl:when test=\"self::xqx:eqOp\"><xsl:text> eq </xsl:text></xsl:when>"
-" <xsl:when test=\"self::xqx:neOp\"><xsl:text> ne </xsl:text></xsl:when>"
-" <xsl:when test=\"self::xqx:ltOp\"><xsl:text> lt </xsl:text></xsl:when>"
-" <xsl:when test=\"self::xqx:gtOp\"><xsl:text> gt </xsl:text></xsl:when>"
-" <xsl:when test=\"self::xqx:leOp\"><xsl:text> le </xsl:text></xsl:when>"
-" <xsl:when test=\"self::xqx:geOp\"><xsl:text> ge </xsl:text></xsl:when>"
+" <xsl:when test=\"self::xqx:eqOp\">"
+" <xsl:text> eq </xsl:text>"
+" </xsl:when>"
+" <xsl:when test=\"self::xqx:neOp\">"
+" <xsl:text> ne </xsl:text>"
+" </xsl:when>"
+" <xsl:when test=\"self::xqx:ltOp\">"
+" <xsl:text> lt </xsl:text>"
+" </xsl:when>"
+" <xsl:when test=\"self::xqx:gtOp\">"
+" <xsl:text> gt </xsl:text>"
+" </xsl:when>"
+" <xsl:when test=\"self::xqx:leOp\">"
+" <xsl:text> le </xsl:text>"
+" </xsl:when>"
+" <xsl:when test=\"self::xqx:geOp\">"
+" <xsl:text> ge </xsl:text>"
+" </xsl:when>"
 " </xsl:choose>"
 " <xsl:apply-templates select=\"xqx:secondOperand\"/>"
 " <xsl:value-of select=\"$RPAREN\"/>"
@@ -422,24 +490,36 @@
 " <xsl:apply-templates select=\"xqx:firstOperand\"/>"
 " <xsl:choose>"
 " <xsl:when test=\"self::xqx:equalOp\">"
-" <xsl:text> </xsl:text><xsl:value-of select=\"$EQUAL\"/><xsl:text> </xsl:text>"
+" <xsl:text> </xsl:text>"
+" <xsl:value-of select=\"$EQUAL\"/>"
+" <xsl:text> </xsl:text>"
 " </xsl:when>"
 " <xsl:when test=\"self::xqx:notEqualOp\">"
-" <xsl:text> !</xsl:text><xsl:value-of select=\"$EQUAL\"/><xsl:text> </xsl:text>"
+" <xsl:text> !</xsl:text>"
+" <xsl:value-of select=\"$EQUAL\"/>"
+" <xsl:text> </xsl:text>"
 " </xsl:when>"
 " <xsl:when test=\"self::xqx:lessThanOp\">"
-" <xsl:text> </xsl:text><xsl:value-of select=\"$LESSTHAN\"/><xsl:text> </xsl:text>"
+" <xsl:text> </xsl:text>"
+" <xsl:value-of select=\"$LESSTHAN\"/>"
+" <xsl:text> </xsl:text>"
 " </xsl:when>"
 " <xsl:when test=\"self::xqx:greaterThanOp\">"
-" <xsl:text> </xsl:text><xsl:value-of select=\"$GREATERTHAN\"/><xsl:text> </xsl:text>"
+" <xsl:text> </xsl:text>"
+" <xsl:value-of select=\"$GREATERTHAN\"/>"
+" <xsl:text> </xsl:text>"
 " </xsl:when>"
 " <xsl:when test=\"self::xqx:lessThanOrEqualOp\">"
-" <xsl:text> </xsl:text><xsl:value-of select=\"$LESSTHAN\"/>"
-" <xsl:value-of select=\"$EQUAL\"/><xsl:text> </xsl:text>"
+" <xsl:text> </xsl:text>"
+" <xsl:value-of select=\"$LESSTHAN\"/>"
+" <xsl:value-of select=\"$EQUAL\"/>"
+" <xsl:text> </xsl:text>"
 " </xsl:when>"
 " <xsl:when test=\"self::xqx:greaterThanOrEqualOp\">"
-" <xsl:text> </xsl:text><xsl:value-of select=\"$GREATERTHAN\"/>"
-" <xsl:value-of select=\"$EQUAL\"/><xsl:text> </xsl:text>"
+" <xsl:text> </xsl:text>"
+" <xsl:value-of select=\"$GREATERTHAN\"/>"
+" <xsl:value-of select=\"$EQUAL\"/>"
+" <xsl:text> </xsl:text>"
 " </xsl:when>"
 " </xsl:choose>"
 " <xsl:apply-templates select=\"xqx:secondOperand\"/>"
@@ -449,13 +529,21 @@
 " <xsl:value-of select=\"$LPAREN\"/>"
 " <xsl:apply-templates select=\"xqx:firstOperand\"/>"
 " <xsl:choose>"
-" <xsl:when test=\"self::xqx:isOp\"><xsl:text> is </xsl:text></xsl:when>"
-" <xsl:when test=\"self::xqx:nodeBeforeOp\"><xsl:text> </xsl:text>"
-" <xsl:value-of select=\"$LESSTHAN\"/><xsl:value-of select=\"$LESSTHAN\"/>"
-" <xsl:text> </xsl:text></xsl:when>"
-" <xsl:when test=\"self::xqx:nodeAfterOp\"><xsl:text> </xsl:text>"
-" <xsl:value-of select=\"$GREATERTHAN\"/><xsl:value-of select=\"$GREATERTHAN\"/>"
-" <xsl:text> </xsl:text></xsl:when>"
+" <xsl:when test=\"self::xqx:isOp\">"
+" <xsl:text> is </xsl:text>"
+" </xsl:when>"
+" <xsl:when test=\"self::xqx:nodeBeforeOp\">"
+" <xsl:text> </xsl:text>"
+" <xsl:value-of select=\"$LESSTHAN\"/>"
+" <xsl:value-of select=\"$LESSTHAN\"/>"
+" <xsl:text> </xsl:text>"
+" </xsl:when>"
+" <xsl:when test=\"self::xqx:nodeAfterOp\">"
+" <xsl:text> </xsl:text>"
+" <xsl:value-of select=\"$GREATERTHAN\"/>"
+" <xsl:value-of select=\"$GREATERTHAN\"/>"
+" <xsl:text> </xsl:text>"
+" </xsl:when>"
 " </xsl:choose>"
 " <xsl:apply-templates select=\"xqx:secondOperand\"/>"
 " <xsl:value-of select=\"$RPAREN\"/>"
@@ -464,8 +552,12 @@
 " <xsl:value-of select=\"$LPAREN\"/>"
 " <xsl:apply-templates select=\"xqx:firstOperand\"/>"
 " <xsl:choose>"
-" <xsl:when test=\"self::xqx:andOp\"><xsl:text> and </xsl:text></xsl:when>"
-" <xsl:when test=\"self::xqx:orOp\"><xsl:text> or </xsl:text></xsl:when>"
+" <xsl:when test=\"self::xqx:andOp\">"
+" <xsl:text> and </xsl:text>"
+" </xsl:when>"
+" <xsl:when test=\"self::xqx:orOp\">"
+" <xsl:text> or </xsl:text>"
+" </xsl:when>"
 " </xsl:choose>"
 " <xsl:apply-templates select=\"xqx:secondOperand\"/>"
 " <xsl:value-of select=\"$RPAREN\"/>"
@@ -474,9 +566,15 @@
 " <xsl:value-of select=\"$LPAREN\"/>"
 " <xsl:apply-templates select=\"xqx:firstOperand\"/>"
 " <xsl:choose>"
-" <xsl:when test=\"self::xqx:unionOp\"><xsl:text> union </xsl:text></xsl:when>"
-" <xsl:when test=\"self::xqx:intersectOp\"><xsl:text> intersect </xsl:text></xsl:when>"
-" <xsl:when test=\"self::xqx:exceptOp\"><xsl:text> except </xsl:text></xsl:when>"
+" <xsl:when test=\"self::xqx:unionOp\">"
+" <xsl:text> union </xsl:text>"
+" </xsl:when>"
+" <xsl:when test=\"self::xqx:intersectOp\">"
+" <xsl:text> intersect </xsl:text>"
+" </xsl:when>"
+" <xsl:when test=\"self::xqx:exceptOp\">"
+" <xsl:text> except </xsl:text>"
+" </xsl:when>"
 " </xsl:choose>"
 " <xsl:apply-templates select=\"xqx:secondOperand\"/>"
 " <xsl:value-of select=\"$RPAREN\"/>"
@@ -520,7 +618,9 @@
 " <xsl:apply-templates/>"
 " </xsl:template>"
 " <xsl:template match=\"xqx:letExpr\">"
+" <xsl:value-of select=\"$SPACE\"/>"
 " <xsl:value-of select=\"$ASSIGN\"/>"
+" <xsl:value-of select=\"$SPACE\"/>"
 " <xsl:apply-templates/>"
 " </xsl:template>"
 " <xsl:template match=\"xqx:windowClause\">"
@@ -609,6 +709,16 @@
 " <xsl:value-of select=\"$DOLLAR\"/>"
 " <xsl:apply-templates/>"
 " </xsl:template>"
+" <!-- 2011-09-14/JM - added the ability to initialize a grouping variable, opt set type -->"
+" <xsl:template match=\"xqx:groupVarInitialize\">"
+" <xsl:if test=\"xqx:typeDeclaration\">"
+" <xsl:apply-templates select=\"xqx:typeDeclaration\"/>"
+" </xsl:if>"
+" <xsl:value-of select=\"$SPACE\"/>"
+" <xsl:value-of select=\"$ASSIGN\"/>"
+" <xsl:value-of select=\"$SPACE\"/>"
+" <xsl:apply-templates select=\"xqx:varValue\"/>"
+" </xsl:template>"
 " <xsl:template match=\"xqx:collation\">"
 " <xsl:text> collation </xsl:text>"
 " <xsl:call-template name=\"quote\">"
@@ -650,7 +760,7 @@
 " <xsl:apply-templates select=\"*\"/>"
 " <xsl:value-of select=\"$NEWLINE\"/>"
 " </xsl:template>"
-"<!-- Surrounding FLWOR expressions with parentheses completes the set -->"
+" <!-- Surrounding FLWOR expressions with parentheses completes the set -->"
 " <xsl:template match=\"xqx:flworExpr\">"
 " <xsl:value-of select=\"$NEWLINE\"/>"
 " <xsl:value-of select=\"$LPAREN\"/>"
@@ -758,10 +868,11 @@
 " <xsl:apply-templates select=\"xqx:switchExprDefaultClause\"/>"
 " <xsl:value-of select=\"$RPAREN\"/>"
 " </xsl:template>"
+" <!-- 2011-09-09/JM - augmented sequenceType with sequenceTypeUnion -->"
 " <xsl:template match=\"xqx:typeswitchExprCaseClause\">"
 " <xsl:text> case </xsl:text>"
 " <xsl:apply-templates select=\"xqx:variableBinding\"/>"
-" <xsl:apply-templates select=\"xqx:sequenceType\"/>"
+" <xsl:apply-templates select=\"xqx:sequenceType | xqx:sequenceTypeUnion\"/>"
 " <xsl:text> return </xsl:text>"
 " <xsl:apply-templates select=\"xqx:resultExpr\"/>"
 " </xsl:template>"
@@ -898,7 +1009,7 @@
 " <xsl:template match=\"xqx:Wildcard[not(*)]\">"
 " <xsl:value-of select=\"$STAR\"/>"
 " </xsl:template>"
-"<!-- select=\"xqx:EQname\" fixed to be select=\"xqx\"QName\"; bug 12674 -->"
+" <!-- select=\"xqx:EQname\" fixed to be select=\"xqx\"QName\"; bug 12674 -->"
 " <xsl:template name=\"simpleWildcard\" match=\"xqx:simpleWildcard\">"
 " <xsl:apply-templates select=\"xqx:star\"/>"
 " <xsl:apply-templates select=\"xqx:QName\"/>"
@@ -927,7 +1038,7 @@
 " <xsl:apply-templates select=\"*\"/>"
 " <xsl:value-of select=\"$RPAREN\"/>"
 " </xsl:template>"
-"<!-- // THIS IS WRONG!! A nameText is a QName *OR* a Wildcard!!! -->"
+" <!-- // THIS IS WRONG!! A nameText is a QName *OR* a Wildcard!!! -->"
 " <xsl:template match=\"xqx:nameTest\">"
 " <xsl:call-template name=\"renderEQName\"/>"
 " </xsl:template>"
@@ -991,19 +1102,28 @@
 " <xsl:text> ) </xsl:text>"
 " </xsl:template>"
 " <!-- rewrote test expression per Bugzilla Bug #2523 -->"
+" <!-- 2011-09-09/JM - Added mapStepExpr -->"
 " <xsl:template match=\"xqx:stepExpr\">"
-" <xsl:if test=\"preceding-sibling::xqx:stepExpr\">"
+" <xsl:if test=\"preceding-sibling::xqx:stepExpr or preceding-sibling::xqx:mapStepExpr\">"
 " <xsl:value-of select=\"$SLASH\"/>"
 " </xsl:if>"
 " <xsl:apply-templates select=\"*\"/>"
 " </xsl:template>"
+" <!-- 2011-09-09/JM - Added mapStepExpr -->"
+" <xsl:template match=\"xqx:mapStepExpr\">"
+" <xsl:if test=\"preceding-sibling::xqx:stepExpr or preceding-sibling::xqx:mapStepExpr\">"
+" <xsl:value-of select=\"$EXCLAMATIONMARK\"/>"
+" </xsl:if>"
+" <xsl:apply-templates select=\"*\"/>"
+" </xsl:template>"
 " <!-- deleted xqx:parenthesizedExpr per Bugzilla Bug #4963 -->"
 " <xsl:template match=\"xqx:filterExpr\">"
 " <xsl:apply-templates/>"
 " </xsl:template>"
 " <!-- part of higher-order functions -->"
 " <!-- Response to Bugzilla bug #12788 -->"
-" <xsl:template match=\"xqx:literalFunctionItemExpr\">"
+" <!-- 2011-11-21 - Jim changed \"literalFunctionItemExpr\" to \"namedFunctionRef\" -->"
+" <xsl:template match=\"xqx:namedFunctionRef\">"
 " <xsl:if test=\"(xqx:functionName = 'node' or"
 " xqx:functionName = 'document-node' or"
 " xqx:functionName = 'element' or"
@@ -1023,23 +1143,33 @@
 " ((not(@xqx:prefix) and not(@xqx:URI)) or"
 " (@xqx:prefix and @xqx:prefix = '') or"
 " (@xqx:URI and @xqx:URI = ''))\">"
-" <xsl:variable name=\"message\"><xsl:text>Incorrect XQueryX: function calls must not use unqualified \"reserved\" name \"</xsl:text><xsl:value-of select=\"xqx:functionName\"/><xsl:text>\"</xsl:text></xsl:variable>"
-" <xsl:message terminate=\"yes\"><xsl:value-of select=\"$message\"/></xsl:message>"
+" <xsl:variable name=\"message\">"
+" <xsl:text>Incorrect XQueryX: function calls must not use unqualified \"reserved\" name \"</xsl:text>"
+" <xsl:value-of select=\"xqx:functionName\"/>"
+" <xsl:text>\"</xsl:text>"
+" </xsl:variable>"
+" <xsl:message terminate=\"yes\">"
+" <xsl:value-of select=\"$message\"/>"
+" </xsl:message>"
 " </xsl:if>"
 " <xsl:apply-templates select=\"xqx:functionName\"/>"
 " <xsl:text>#</xsl:text>"
 " <xsl:apply-templates select=\"xqx:integerConstantExpr\"/>"
 " </xsl:template>"
 " <!-- part of higher-order functions -->"
-" <xsl:template match=\"xqx:inlineFunctionItemExpr\">"
+" <!-- 2011-09-09/JM - Added annotations to inline functions -->"
+" <!-- 2011-11-21 - Jim changed \"inlineFunctionItemExpr\" to \"inlineFunctionExpr\" -->"
+" <xsl:template match=\"xqx:inlineFunctionExpr\">"
+" <xsl:apply-templates select=\"xqx:annotation\"/>"
 " <xsl:text> function </xsl:text>"
 " <xsl:apply-templates select=\"xqx:paramList\"/>"
 " <xsl:apply-templates select=\"xqx:typeDeclaration\"/>"
 " <xsl:apply-templates select=\"xqx:functionBody\"/>"
 " </xsl:template>"
 " <!-- rewrote pathExpr template per Bugzilla Bug #2523 -->"
+" <!-- 2011-09-09/JM - Added mapStepExpr as an alternative -->"
 " <xsl:template match=\"xqx:pathExpr\">"
-" <xsl:apply-templates select=\"xqx:rootExpr | xqx:stepExpr\"/>"
+" <xsl:apply-templates select=\"xqx:rootExpr | xqx:stepExpr | xqx:mapStepExpr\"/>"
 " </xsl:template>"
 " <!-- To resolve Bugzilla bug #3446, we now escape NL (#xA) and TAB (#x9)"
 " characters in attribute values -->"
@@ -1061,12 +1191,20 @@
 " <xsl:with-param name=\"stringToBeFixed\">"
 " <xsl:value-of select=\"xqx:attributeValue\"/>"
 " </xsl:with-param>"
-" <xsl:with-param name=\"toBeReplaced\"><xsl:text>{</xsl:text></xsl:with-param>"
-" <xsl:with-param name=\"replacement\"><xsl:text>{{</xsl:text></xsl:with-param>"
+" <xsl:with-param name=\"toBeReplaced\">"
+" <xsl:text>{</xsl:text>"
+" </xsl:with-param>"
+" <xsl:with-param name=\"replacement\">"
+" <xsl:text>{{</xsl:text>"
+" </xsl:with-param>"
 " </xsl:call-template>"
 " </xsl:with-param>"
-" <xsl:with-param name=\"toBeReplaced\"><xsl:text>}</xsl:text></xsl:with-param>"
-" <xsl:with-param name=\"replacement\"><xsl:text>}}</xsl:text></xsl:with-param>"
+" <xsl:with-param name=\"toBeReplaced\">"
+" <xsl:text>}</xsl:text>"
+" </xsl:with-param>"
+" <xsl:with-param name=\"replacement\">"
+" <xsl:text>}}</xsl:text>"
+" </xsl:with-param>"
 " </xsl:call-template>"
 " </xsl:with-param>"
 " </xsl:call-template>"
@@ -1131,9 +1269,11 @@
 " <xsl:for-each select=\"*\">"
 " <xsl:if test=\"not(self::xqx:elementConstructor)\">"
 " <xsl:value-of select=\"$LBRACE\"/>"
+" <xsl:value-of select=\"$SPACE\"/>"
 " </xsl:if>"
 " <xsl:apply-templates select=\".\"/>"
 " <xsl:if test=\"not(self::xqx:elementConstructor)\">"
+" <xsl:value-of select=\"$SPACE\"/>"
 " <xsl:value-of select=\"$RBRACE\"/>"
 " </xsl:if>"
 " </xsl:for-each>"
@@ -1161,7 +1301,7 @@
 " <xsl:value-of select=\"$SPACE\"/>"
 " <xsl:value-of select=\"$LBRACE\"/>"
 " <xsl:value-of select=\"$SPACE\"/>"
-" <xsl:apply-templates select=\"xqx:contentExpr\"/> "
+" <xsl:apply-templates select=\"xqx:contentExpr\"/>"
 " <xsl:value-of select=\"$SPACE\"/>"
 " <xsl:value-of select=\"$RBRACE\"/>"
 " </xsl:template>"
@@ -1174,7 +1314,7 @@
 " <xsl:apply-templates select=\"xqx:tagNameExpr\"/>"
 " <xsl:value-of select=\"$SPACE\"/>"
 " <xsl:value-of select=\"$LBRACE\"/>"
-" <xsl:apply-templates select=\"xqx:valueExpr\"/> "
+" <xsl:apply-templates select=\"xqx:valueExpr\"/>"
 " <xsl:value-of select=\"$SPACE\"/>"
 " <xsl:value-of select=\"$RBRACE\"/>"
 " </xsl:template>"
@@ -1219,11 +1359,11 @@
 " <xsl:apply-templates select=\"*\"/>"
 " <xsl:value-of select=\"$RBRACE\"/>"
 " </xsl:template>"
-"<!-- Move value braces into computedPIConstructor template from this template, Bugzilla bug #3442 -->"
+" <!-- Move value braces into computedPIConstructor template from this template, Bugzilla bug #3442 -->"
 " <xsl:template match=\"xqx:piValueExpr\">"
 " <xsl:apply-templates select=\"*\"/>"
 " </xsl:template>"
-"<!-- Move value braces into this template from piValueExpr template, Bugzilla bug #3442 -->"
+" <!-- Move value braces into this template from piValueExpr template, Bugzilla bug #3442 -->"
 " <xsl:template match=\"xqx:computedPIConstructor\">"
 " <xsl:text> processing-instruction </xsl:text>"
 " <xsl:value-of select=\"xqx:piTarget\"/>"
@@ -1361,6 +1501,16 @@
 " <xsl:template match=\"xqx:sequenceType\">"
 " <xsl:apply-templates select=\"*\"/>"
 " </xsl:template>"
+" <!-- 2011-09-09/JM - added a sequenceTypeUnion type -->"
+" <xsl:template match=\"xqx:sequenceTypeUnion\">"
+" <xsl:apply-templates select=\"xqx:sequenceType[1]\"/>"
+" <xsl:if test=\"count(xqx:sequenceType) > 1\">"
+" <xsl:for-each select=\"xqx:sequenceType[position() > 1]\">"
+" <xsl:text> | </xsl:text>"
+" <xsl:apply-templates select=\".\"/>"
+" </xsl:for-each>"
+" </xsl:if>"
+" </xsl:template>"
 " <xsl:template match=\"xqx:singleType\">"
 " <xsl:apply-templates select=\"xqx:atomicType\"/>"
 " <xsl:if test=\"xqx:optional\">"
@@ -1415,7 +1565,7 @@
 " </xsl:if>"
 " </xsl:if>"
 " </xsl:template>"
-"<!-- Part of fix for Bugzilla bug #3520 -->"
+" <!-- Part of fix for Bugzilla bug #3520 -->"
 " <xsl:template match=\"xqx:targetLocation\">"
 " <xsl:choose>"
 " <xsl:when test=\"position()=1\"> at </xsl:when>"
@@ -1425,7 +1575,7 @@
 " <xsl:with-param name=\"item\" select=\".\"/>"
 " </xsl:call-template>"
 " </xsl:template>"
-"<!-- Modified to fix Bugzilla bug #3520 -->"
+" <!-- Modified to fix Bugzilla bug #3520 -->"
 " <xsl:template match=\"xqx:schemaImport\">"
 " <xsl:text> import schema </xsl:text>"
 " <xsl:if test=\"xqx:defaultElementNamespace\">"
@@ -1441,7 +1591,7 @@
 " </xsl:call-template>"
 " <xsl:apply-templates select=\"xqx:targetLocation\"/>"
 " </xsl:template>"
-"<!-- Modified to fix Bugzilla bug #3520 -->"
+" <!-- Modified to fix Bugzilla bug #3520 -->"
 " <xsl:template match=\"xqx:moduleImport\">"
 " <xsl:text> import module </xsl:text>"
 " <xsl:if test=\"xqx:namespacePrefix\">"
@@ -1522,10 +1672,6 @@
 " <xsl:message terminate=\"yes\">Incorrect XQueryX: The only top-level element permitted is xqx:module</xsl:message>"
 " </xsl:template>"
 " <!-- XQueryX Update -->"
-" <!-- Initial creation 2006-08-17: Jim Melton -->"
-" <!-- Added revalidationDecl 2006-08-21: Jim Melton -->"
-" <!-- Bring up to date with spec 2007-08-07: Jim Melton -->"
-" <!-- Surround updating exprs w/parens 2007-09-13: Jim Melton -->"
 " <!-- revalidationDecl -->"
 " <xsl:template match=\"xqxuf:revalidationDecl\">"
 " <xsl:text>declare revalidation </xsl:text>"
@@ -1552,10 +1698,10 @@
 " <!-- insertInto -->"
 " <xsl:template match=\"xqxuf:insertInto\">"
 " <xsl:if test=\"child::node()\">"
-" <xsl:text> as </xsl:text>"
+" <xsl:text>as </xsl:text>"
 " </xsl:if>"
 " <xsl:apply-templates/>"
-" <xsl:text> into </xsl:text>"
+" <xsl:text>into </xsl:text>"
 " </xsl:template>"
 " <!-- insertAsFirst -->"
 " <xsl:template match=\"xqxuf:insertAsFirst\">"
@@ -1567,11 +1713,11 @@
 " </xsl:template>"
 " <!-- insertAfter -->"
 " <xsl:template match=\"xqxuf:insertAfter\">"
-" <xsl:text> after </xsl:text>"
+" <xsl:text>after </xsl:text>"
 " </xsl:template>"
 " <!-- insertBefore -->"
 " <xsl:template match=\"xqxuf:insertBefore\">"
-" <xsl:text> before </xsl:text>"
+" <xsl:text>before </xsl:text>"
 " </xsl:template>"
 " <!-- targetExpr -->"
 " <xsl:template match=\"xqxuf:targetExpr\">"
@@ -1665,7 +1811,353 @@
 " <xsl:text> external </xsl:text>"
 " </xsl:if>"
 " </xsl:template>"
-"</xsl:stylesheet>"
+;
+const char xqueryx_fulltext_xslt[] = 
+" <!-- Initial creation 2006-08-17: Jim Melton -->"
+" <!-- Added ftOptionDecl, ftScoreVariableBinding 2006-08-21: Jim Melton -->"
+" <!-- First version believed complete 2006-08-29: Jim Melton -->"
+" <!-- Revised to align with 2008-01-24 draft 2008-02-08: Jim Melton -->"
+" <!-- Revised position of \"weight\" in grammar 2008-11-12: Jim Melton -->"
+" <!-- Various bug fixes 2009-07-14: Michael Dyck -->"
+" <!-- ftcontains => \"contains text\", Bug 7247 2009-09-17: Jim Melton -->"
+" <!-- with => using, stop words default, Bug 7271 2009-09-17: Jim Melton -->"
+" <!-- {} around weight values, around empty"
+" selection after pragmas 2010-09-07: Jim Melton -->"
+" <!-- ftOptionDecl -->"
+" <xsl:template match=\"xqxft:ftOptionDecl\">"
+" <xsl:text>declare ft-option </xsl:text>"
+" <xsl:apply-templates/>"
+" </xsl:template>"
+" <!-- ftScoreVariableBinding -->"
+" <xsl:template match=\"xqxft:ftScoreVariableBinding\">"
+" <xsl:text> score </xsl:text>"
+" <xsl:value-of select=\"$DOLLAR\"/>"
+" <xsl:if test=\"@xqx:prefix\">"
+" <xsl:value-of select=\"@xqx:prefix\"/>"
+" <xsl:value-of select=\"$COLON\"/>"
+" </xsl:if>"
+" <xsl:value-of select=\".\"/>"
+" </xsl:template>"
+" <!-- ftcontains -->"
+" <xsl:template match=\"xqxft:ftContainsExpr\">"
+" <xsl:apply-templates select=\"xqxft:ftRangeExpr\"/>"
+" <xsl:text> contains text </xsl:text>"
+" <xsl:apply-templates select=\"xqxft:ftSelectionExpr\"/>"
+" <xsl:apply-templates select=\"xqxft:ftIgnoreOption\"/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:value\">"
+" <xsl:apply-templates/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftRangeExpr\">"
+" <xsl:apply-templates/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftLiteralRangeExpr\">"
+" <xsl:apply-templates/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftSelectionExpr\">"
+" <xsl:apply-templates/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftIgnoreOption\">"
+" <xsl:text>without content </xsl:text>"
+" <xsl:apply-templates/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftSelection\">"
+" <xsl:apply-templates select=\"xqxft:ftSelectionSource\"/>"
+" <xsl:value-of select=\"$NEWLINE\"/>"
+" <xsl:text> </xsl:text>"
+" <xsl:apply-templates select=\"xqxft:ftPosFilter\"/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftSelectionSource\">"
+" <xsl:apply-templates/>"
+" <xsl:text> </xsl:text>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftPosFilter\">"
+" <xsl:apply-templates/>"
+" <xsl:value-of select=\"$NEWLINE\"/>"
+" <xsl:text> </xsl:text>"
+" </xsl:template>"
+" <!-- FTProximity alternative: ordered -->"
+" <xsl:template match=\"xqxft:ftOrdered\">"
+" <xsl:text>ordered </xsl:text>"
+" <xsl:value-of select=\"$NEWLINE\"/>"
+" </xsl:template>"
+" <!-- FTProximity alternative: window -->"
+" <xsl:template match=\"xqxft:ftWindow\">"
+" <xsl:text>window </xsl:text>"
+" <xsl:apply-templates select=\"xqxft:value\"/>"
+" <xsl:text> </xsl:text>"
+" <xsl:value-of select=\"xqxft:unit\"/>"
+" <xsl:text>s</xsl:text>"
+" <xsl:value-of select=\"$NEWLINE\"/>"
+" </xsl:template>"
+" <!-- FTProximity alternative: distance -->"
+" <xsl:template match=\"xqxft:ftDistance\">"
+" <xsl:text>distance </xsl:text>"
+" <xsl:apply-templates select=\"xqxft:ftRange\"/>"
+" <xsl:text> </xsl:text>"
+" <xsl:value-of select=\"xqxft:unit\"/>"
+" <xsl:text>s</xsl:text>"
+" <xsl:value-of select=\"$NEWLINE\"/>"
+" </xsl:template>"
+" <!-- FTProximity alternative: scope -->"
+" <xsl:template match=\"xqxft:ftScope\">"
+" <xsl:value-of select=\"xqxft:type\"/>"
+" <xsl:text> </xsl:text>"
+" <xsl:value-of select=\"xqxft:unit\"/>"
+" <xsl:value-of select=\"$NEWLINE\"/>"
+" </xsl:template>"
+" <!-- FTProximity alternative: content -->"
+" <xsl:template match=\"xqxft:ftContent\">"
+" <xsl:value-of select=\"xqxft:location\"/>"
+" <xsl:value-of select=\"$NEWLINE\"/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:exactlyRange | xqxft:exactlyLiteralRange\">"
+" <xsl:text>exactly </xsl:text>"
+" <xsl:apply-templates select=\"xqxft:value\"/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:atLeastRange | xqxft:atLeastLiteralRange\">"
+" <xsl:text>at least </xsl:text>"
+" <xsl:apply-templates select=\"xqxft:value\"/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:atMostRange | xqxft:atMostLiteralRange\">"
+" <xsl:text>at most </xsl:text>"
+" <xsl:apply-templates select=\"xqxft:value\"/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:fromToRange | xqxft:fromToLiteralRange\">"
+" <xsl:text>from </xsl:text>"
+" <xsl:apply-templates select=\"xqxft:lower\"/>"
+" <xsl:text> to </xsl:text>"
+" <xsl:apply-templates select=\"xqxft:upper\"/>"
+" <xsl:text> </xsl:text>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:lower\">"
+" <xsl:apply-templates/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:upper\">"
+" <xsl:apply-templates/>"
+" </xsl:template>"
+" <!-- ftMatchOption alternative: case -->"
+" <xsl:template match=\"xqxft:case\">"
+" <xsl:text> using </xsl:text>"
+" <xsl:value-of select=\"xqxft:value\"/>"
+" <xsl:value-of select=\"$NEWLINE\"/>"
+" </xsl:template>"
+" <!-- ftMatchOption alternative: diacritics -->"
+" <xsl:template match=\"xqxft:diacritics\">"
+" <xsl:text> using </xsl:text>"
+" <xsl:value-of select=\"xqxft:value\"/>"
+" <xsl:value-of select=\"$NEWLINE\"/>"
+" </xsl:template>"
+" <!-- ftMatchOption alternative: stemming -->"
+" <xsl:template match=\"xqxft:stem\">"
+" <xsl:text> using </xsl:text>"
+" <xsl:value-of select=\"xqxft:value\"/>"
+" <xsl:value-of select=\"$NEWLINE\"/>"
+" </xsl:template>"
+" <!-- ftMatchOption alternative: thesaurus -->"
+" <xsl:template match=\"xqxft:thesaurus\">"
+" <xsl:text> using </xsl:text>"
+" <xsl:choose>"
+" <xsl:when test=\"xqxft:noThesauri\">"
+" <xsl:text>no thesaurus </xsl:text>"
+" </xsl:when>"
+" <xsl:otherwise>"
+" <xsl:apply-templates/>"
+" </xsl:otherwise>"
+" </xsl:choose>"
+" <xsl:value-of select=\"$NEWLINE\"/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:thesauri\">"
+" <xsl:text> </xsl:text>"
+" <xsl:text>thesaurus </xsl:text>"
+" <xsl:choose>"
+" <xsl:when test=\"child::*[2]\">"
+" <xsl:call-template name=\"parenthesizedList\"/>"
+" </xsl:when>"
+" <xsl:otherwise>"
+" <xsl:apply-templates/>"
+" </xsl:otherwise>"
+" </xsl:choose>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:default\">"
+" <xsl:text>default </xsl:text>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:thesaurusID\">"
+" <xsl:apply-templates/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:at\">"
+" <xsl:text>at \"</xsl:text>"
+" <xsl:value-of select=\".\"/>"
+" <xsl:text>\" </xsl:text>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:relationship\">"
+" <xsl:text>relationship \"</xsl:text>"
+" <xsl:value-of select=\".\"/>"
+" <xsl:text>\" </xsl:text>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:levels\">"
+" <xsl:apply-templates/>"
+" <xsl:text> levels </xsl:text>"
+" </xsl:template>"
+" <!-- ftMatchOption alternative: stopword -->"
+" <xsl:template match=\"xqxft:stopword\">"
+" <xsl:text>using </xsl:text>"
+" <xsl:choose>"
+" <xsl:when test=\"xqxft:noStopwords\">"
+" <xsl:text>no stop words </xsl:text>"
+" </xsl:when>"
+" <xsl:otherwise>"
+" <xsl:apply-templates/>"
+" </xsl:otherwise>"
+" </xsl:choose>"
+" <xsl:value-of select=\"$NEWLINE\"/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:stopwords\">"
+" <xsl:text> </xsl:text>"
+" <xsl:choose>"
+" <xsl:when test=\"xqxft:default\">"
+" <xsl:text>stop words default </xsl:text>"
+" </xsl:when>"
+" <xsl:otherwise>"
+" <xsl:text>stop words </xsl:text>"
+" <xsl:apply-templates select=\"xqxft:ftStopWords\"/>"
+" </xsl:otherwise>"
+" </xsl:choose>"
+" <xsl:apply-templates select=\"xqxft:ftStopWordsInclExcl\"/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftStopWords\">"
+" <xsl:call-template name=\"ftStopWords_type\"/>"
+" </xsl:template>"
+" <xsl:template name=\"ftStopWords_type\">"
+" <xsl:choose>"
+" <xsl:when test=\"xqxft:ref\">"
+" <xsl:text>at \"</xsl:text>"
+" <xsl:value-of select=\"xqxft:ref\"/>"
+" <xsl:text>\" </xsl:text>"
+" </xsl:when>"
+" <xsl:otherwise>"
+" <xsl:apply-templates/>"
+" </xsl:otherwise>"
+" </xsl:choose>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:list\">"
+" <xsl:call-template name=\"parenthesizedList\"/>"
+" <xsl:text> </xsl:text>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:FTStopWordsInclExcl\">"
+" <xsl:apply-templates/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:union\">"
+" <xsl:text>union </xsl:text>"
+" <xsl:call-template name=\"ftStopWords_type\"/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:except\">"
+" <xsl:text>except </xsl:text>"
+" <xsl:call-template name=\"ftStopWords_type\"/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:language\">"
+" <xsl:text>using language \"</xsl:text>"
+" <xsl:apply-templates/>"
+" <xsl:text>\"</xsl:text>"
+" <xsl:value-of select=\"$NEWLINE\"/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:wildcard\">"
+" <xsl:text>using </xsl:text>"
+" <xsl:apply-templates/>"
+" <xsl:value-of select=\"$NEWLINE\"/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftAnd\">"
+" <xsl:apply-templates select=\"xqx:firstOperand\"/>"
+" <xsl:text> ftand </xsl:text>"
+" <xsl:apply-templates select=\"xqx:secondOperand\"/>"
+" <xsl:text> </xsl:text>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftOr\">"
+" <xsl:apply-templates select=\"xqx:firstOperand\"/>"
+" <xsl:text> ftor </xsl:text>"
+" <xsl:apply-templates select=\"xqx:secondOperand\"/>"
+" <xsl:text> </xsl:text>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftMildNot\">"
+" <xsl:apply-templates select=\"xqx:firstOperand\"/>"
+" <xsl:text> not in </xsl:text>"
+" <xsl:apply-templates select=\"xqx:secondOperand\"/>"
+" <xsl:text> </xsl:text>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftUnaryNot\">"
+" <xsl:text>ftnot </xsl:text>"
+" <xsl:apply-templates select=\"xqx:operand\"/>"
+" <xsl:text> </xsl:text>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftPrimaryWithOptions\">"
+" <xsl:apply-templates/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftPrimary\">"
+" <xsl:apply-templates/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:parenthesized\">"
+" <xsl:text>( </xsl:text>"
+" <xsl:apply-templates/>"
+" <xsl:text> ) </xsl:text>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftWords\">"
+" <xsl:apply-templates/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftWordsValue\">"
+" <xsl:apply-templates/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftWordsLiteral\">"
+" <xsl:apply-templates/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftWordsExpression\">"
+" <xsl:text> { </xsl:text>"
+" <xsl:apply-templates/>"
+" <xsl:text> } </xsl:text>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftAnyAllOption\">"
+" <xsl:value-of select=\".\"/>"
+" <xsl:text> </xsl:text>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftTimes\">"
+" <xsl:text>occurs </xsl:text>"
+" <xsl:apply-templates/>"
+" <xsl:text> times </xsl:text>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftExtensionSelection\">"
+" <xsl:apply-templates select=\"xqxft:pragma\"/>"
+" <xsl:text> { </xsl:text>"
+" <xsl:apply-templates select=\"xqxft:ftSelection\"/>"
+" <xsl:text> } </xsl:text>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:pragma\">"
+" <xsl:value-of select=\"$PRAGMA_BEGIN\"/>"
+" <xsl:apply-templates select=\"xqx:pragmaName\"/>"
+" <xsl:value-of select=\"$SPACE\"/>"
+" <xsl:value-of select=\"xqx:pragmaContents\"/>"
+" <xsl:value-of select=\"$PRAGMA_END\"/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftExtensionOption\">"
+" <xsl:text>using option </xsl:text>"
+" <xsl:apply-templates/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftExtensionName\">"
+" <xsl:if test=\"@xqx:prefix\">"
+" <xsl:value-of select=\"@xqx:prefix\"/>"
+" <xsl:value-of select=\"$COLON\"/>"
+" </xsl:if>"
+" <xsl:apply-templates/>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:ftExtensionValue\">"
+" <xsl:text> \"</xsl:text>"
+" <xsl:apply-templates/>"
+" <xsl:text>\"</xsl:text>"
+" </xsl:template>"
+" <xsl:template match=\"xqxft:weight\">"
+" <xsl:text> weight { </xsl:text>"
+" <xsl:apply-templates/>"
+" <xsl:text> } </xsl:text>"
+" </xsl:template>"
+" </xsl:stylesheet>"
 "";
 
 };//end namespace zorba
 
=== modified file 'src/compiler/xqueryx/xqueryx_xslt.h'
--- src/compiler/xqueryx/xqueryx_xslt.h	2011-07-05 17:10:30 +0000
+++ src/compiler/xqueryx/xqueryx_xslt.h	2012-01-26 09:42:31 +0000
@@ -19,7 +19,8 @@
 
 namespace zorba {
 
-extern const char xqueryx_update_xslt[];
+extern const char xqueryx3_0_update_xslt[];
+extern const char xqueryx_fulltext_xslt[];
 
 }
 
 
=== modified file 'test/rbkt/Queries/CMakeLists.txt'
--- test/rbkt/Queries/CMakeLists.txt	2012-01-11 17:30:25 +0000
+++ test/rbkt/Queries/CMakeLists.txt	2012-01-26 09:42:31 +0000
@@ -109,6 +109,9 @@
 # Flag to remember whether we found the XQTS here or not
 SET(FOUND_XQTS 0)
 
+# Flag to remember whether we found the XQFTTS here or not
+SET(FOUND_XQFTTS 0)
+
 # QQQ It's ugly that we have to re-run FIND_PACKAGE here (and hence
 # have to re-check for ZORBA_SUPPRESS_XXX here). There should be some
 # way to do the lookup just once - ideally by moving those tests which
@@ -167,7 +170,14 @@
     IF (NEEDS_FULL_TEXT)
       SET (SKIP_TEST 1)
     ENDIF (NEEDS_FULL_TEXT)
+  ELSE (ZORBA_NO_FULL_TEXT)
+    IF (TESTNAME MATCHES "^test/rbkt/w3c_full_text_testsuite")
+      SET (FOUND_XQFTTS 1)
+    ENDIF(TESTNAME MATCHES "^test/rbkt/w3c_full_text_testsuite")
   ENDIF (ZORBA_NO_FULL_TEXT)
+  IF(TESTNAME MATCHES "w3c_testsuite/TestSources/")
+    SET (SKIP_TEST 1)
+  ENDIF(TESTNAME MATCHES "w3c_testsuite/TestSources/")
   IF(WIN32)
     #this test fails on Windows because cannot find ourlib.dll
     #bug 908062
@@ -203,8 +213,13 @@
 IF (ZORBATEST_TESTDRIVER_MT_AVAILABLE AND ZORBATEST_USE_MT_XQTS AND
     IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/w3c_testsuite")
   MESSAGE (STATUS "Adding multi-threaded XQTS test")
-  ZORBA_ADD_TEST(xqts testdriver_mt -q -b w3c_testsuite
+  ZORBA_ADD_TEST(xqts-xquery testdriver_mt -q -b w3c_testsuite/XQuery
     -k "${CMAKE_CURRENT_SOURCE_DIR}/w3c_known_failures.txt")
+  IF (ZORBA_TEST_XQUERYX)
+    MESSAGE (STATUS "Adding multi-threaded XQTS-XQueryX test")
+    ZORBA_ADD_TEST(xqts-xqx testdriver_mt -q -b w3c_testsuite/XQueryX
+      -k "${CMAKE_CURRENT_SOURCE_DIR}/w3c_known_failures_XQueryX.txt")
+  ENDIF (ZORBA_TEST_XQUERYX)
 ENDIF (ZORBATEST_TESTDRIVER_MT_AVAILABLE AND ZORBATEST_USE_MT_XQTS AND
   IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/w3c_testsuite")
 
@@ -230,6 +245,18 @@
 
   IF(ZORBA_TEST_XQUERYX)
 
+    EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQueryX/PathExpr/Steps/Steps-leading-lone-slash-8a 3408285)
+  
+    EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQueryX/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-27 909303)
+    EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQueryX/Construct/DirectConElem/DirectConElemWhitespace/K2-DirectConElemWhitespace-25 909303)
+
+    IF(NOT ZORBA_WITH_BIG_INTEGER)
+      # These tests fail due to integer overflow.
+      EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQueryX/Operators/CompExpr/ValComp/NumericComp/NumericGT/K2-NumericGT-1 3323548)
+      EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQueryX/Operators/CompExpr/ValComp/NumericComp/NumericGT/K2-NumericGT-2 3323548)
+      EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQueryX/Operators/CompExpr/ValComp/NumericComp/NumericLT/K2-NumericLT-1 3323548)
+      EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQueryX/Operators/CompExpr/ValComp/NumericComp/NumericLT/K2-NumericLT-2 3323548)
+    ENDIF(NOT ZORBA_WITH_BIG_INTEGER)
     #w3c bug
     EXPECTED_FAILURE (test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes011 3355019)
     EXPECTED_FAILURE (test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes012 3355019)
@@ -240,10 +267,217 @@
   
   #this is marked as expected failure because the RQ uses XQTS_1_0_3. In that version the expected result is err:FODC0004 instead of err:FODC0002.
   #W3C has changed the expected result for this test in the meantime: please see http://www.w3.org/Bugs/Public/show_bug.cgi?id=12542
-  EXPECTED_FAILURE (test/rbkt/w3c_testsuite/XQuery/Functions/NodeSeqFunc/SeqCollectionFunc/fn-collection-2 882002)
+  #EXPECTED_FAILURE (test/rbkt/w3c_testsuite/XQuery/Functions/NodeSeqFunc/SeqCollectionFunc/fn-collection-2 882002)
 
 ENDIF (FOUND_XQTS AND NOT ZORBA_TEST_W3C_TO_SUBMIT_RESULTS)
 
+
+IF (FOUND_XQFTTS AND NOT ZORBA_TEST_W3C_TO_SUBMIT_RESULTS)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/UseCase/UseCase-SCORE/score-queries-results-q2 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/UseCase/UseCase-SCORE/score-queries-results-q6 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/UseCase/UseCase-SCORE/score-queries-results-q5 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/UseCase/UseCase-SCORE/score-queries-results-q4 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/UseCase/UseCase-SCORE/score-queries-results-q1 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/UseCase/UseCase-SCORE/score-queries-results-q3 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/UseCase/UseCase-SCORE/score-queries-results-q3b 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/UseCase/UseCase-FULL-TEXT-COMPOSABILITY/full-text-composability-queries-results-q4 866926)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/UseCase/UseCase-XQUERY-XPATH-COMPOSABILITY/xquery-xpath-composability-queries-results-q9 866926)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/UseCase/UseCase-XQUERY-XPATH-COMPOSABILITY/xquery-xpath-composability-queries-results-q9b 866926)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/UseCase/UseCase-IGNORE/ignore-queries-results-q1 866924)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/UseCase/UseCase-IGNORE/ignore-queries-results-q4 866924)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/UseCase/UseCase-IGNORE/ignore-queries-results-q1b 866924)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Examples/3.2-SearchTokensAndPhrases/ft-3.2-examples-q5 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Examples/2.3.1-UsingWeightsWithinAScoredFTContainsExpr/examples-231-q1 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Examples/2.3-ScoreVariables/examples-23-q4 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Examples/2.3-ScoreVariables/examples-23-q3 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Examples/2.3-ScoreVariables/examples-23-q2 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Examples/2.3-ScoreVariables/examples-23-q5 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Examples/2.3-ScoreVariables/examples-23-q1 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Examples/3.6.2-WindowSelection/unconstrained-examples-362-5 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Examples/3.6.2-WindowSelection/examples-362-5 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-3 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-Var2 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-Var1 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-BadVar2 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-unconstrained-3 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-unconstrained-4 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-unconstrained-1 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-unconstrained-6 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-Var3 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-6 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-unconstrained-Var2 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-unconstrained-2 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-BadVar1 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-unconstrained-Var3 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-5 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-unconstrained-5 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-unconstrained-Var1 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-4 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-2 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-1 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/LetScoreExpr/LetScoreExpr-unconstrained-1 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/LetScoreExpr/LetScoreExpr-3 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/LetScoreExpr/LetScoreExpr-4 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/LetScoreExpr/LetScoreExpr-unconstrained-3 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/LetScoreExpr/LetScoreExpr-unconstrained-4 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/FLWORExpr/LetScoreExpr/LetScoreExpr-1 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/PositionalFilters/FTScope/different-sentence-08 866907)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/PositionalFilters/FTScope/different-sentence-03 866907)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/PositionalFilters/FTScope/different-sentence-04 866907)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/PositionalFilters/FTScope/different-sentence-05 866907)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/PositionalFilters/FTScope/different-sentence-12 866907)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/PositionalFilters/FTScope/different-sentence-10 866907)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/PositionalFilters/FTScope/different-sentence-09 866907)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/PositionalFilters/FTScope/different-sentence-13 866907)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/PositionalFilters/FTScope/different-sentence-11 866907)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/FTWords/FTWordsValue-IntegerLiteral 866911)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/FTWords/FTWordsValue-DecimalLiteral 866911)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-unconstrained-q1d 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-q1g 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-q1h 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-q1e 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-unconstrained-q1g 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-q2a 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-q1c 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-unconstrained-q1e 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-q1d 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-q1a 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-q1b 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-unconstrained-q1f 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-q1f 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-q2b 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-q3 866923)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-unconstrained-q1h 866923)
+
+  #the bug #11950 is a W3C bug, http://www.w3.org/Bugs/Public/show_bug.cgi?id=11950
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/UseCase/UseCase-ACROSS/across-queries-results-q2 11950)
+  EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQuery/UseCase/UseCase-ACROSS/across-queries-results-q2b 11950)
+  
+  IF(ZORBA_TEST_XQUERYX)
+    #XQueryX failures
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-SCORE/score-queries-results-q2 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-SCORE/score-queries-results-q6 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-SCORE/score-queries-results-q5 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-SCORE/score-queries-results-q4 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-SCORE/score-queries-results-q1 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-SCORE/score-queries-results-q3 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-SCORE/score-queries-results-q3b 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-FULL-TEXT-COMPOSABILITY/full-text-composability-queries-results-q4 866926)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-XQUERY-XPATH-COMPOSABILITY/xquery-xpath-composability-queries-results-q9 866926)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-XQUERY-XPATH-COMPOSABILITY/xquery-xpath-composability-queries-results-q9b 866926)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-IGNORE/ignore-queries-results-q1 866924)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-IGNORE/ignore-queries-results-q4 866924)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-IGNORE/ignore-queries-results-q1b 866924)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Examples/3.2-SearchTokensAndPhrases/ft-3.2-examples-q5 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Examples/2.3.1-UsingWeightsWithinAScoredFTContainsExpr/examples-231-q1 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Examples/2.3-ScoreVariables/examples-23-q4 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Examples/2.3-ScoreVariables/examples-23-q3 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Examples/2.3-ScoreVariables/examples-23-q2 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Examples/2.3-ScoreVariables/examples-23-q5 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Examples/2.3-ScoreVariables/examples-23-q1 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Examples/3.6.2-WindowSelection/unconstrained-examples-362-5 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Examples/3.6.2-WindowSelection/examples-362-5 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-3 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-Var2 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-Var1 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-BadVar2 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-unconstrained-3 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-unconstrained-4 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-unconstrained-1 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-unconstrained-6 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-Var3 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-6 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-unconstrained-Var2 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-unconstrained-2 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-BadVar1 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-unconstrained-Var3 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-5 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-unconstrained-5 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-unconstrained-Var1 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-4 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-2 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/ForScoreExpr/ForScoreExpr-1 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/LetScoreExpr/LetScoreExpr-unconstrained-1 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/LetScoreExpr/LetScoreExpr-3 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/LetScoreExpr/LetScoreExpr-4 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/LetScoreExpr/LetScoreExpr-unconstrained-3 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/LetScoreExpr/LetScoreExpr-unconstrained-4 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/FLWORExpr/LetScoreExpr/LetScoreExpr-1 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/PositionalFilters/FTScope/different-sentence-08 866907)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/PositionalFilters/FTScope/different-sentence-03 866907)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/PositionalFilters/FTScope/different-sentence-04 866907)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/PositionalFilters/FTScope/different-sentence-05 866907)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/PositionalFilters/FTScope/different-sentence-12 866907)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/PositionalFilters/FTScope/different-sentence-10 866907)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/PositionalFilters/FTScope/different-sentence-09 866907)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/PositionalFilters/FTScope/different-sentence-13 866907)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/PositionalFilters/FTScope/different-sentence-11 866907)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-unconstrained-q1d 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-q1g 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-q1h 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-q1e 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-unconstrained-q1g 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-q2a 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-q1c 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-unconstrained-q1e 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-q1d 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-q1a 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-q1b 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-unconstrained-q1f 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-q1f 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-q2b 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-q3 866923)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/Weight/FTSelection-Weight-unconstrained-q1h 866923)
+
+    #the bug #11950 is a W3C bug, http://www.w3.org/Bugs/Public/show_bug.cgi?id=11950
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-ACROSS/across-queries-results-q2 11950)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-ACROSS/across-queries-results-q2b 11950)
+
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-STOP-WORD/stop-word-queries-results-q1b 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-STOP-WORD/stop-word-queries-results-q1 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-STOP-WORD/stop-word-queries-results-q3b 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-STOP-WORD/stop-word-queries-results-q3 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Examples/3.4.7-StopWordOption/ft-5.2.11-examples-q5 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Examples/3.4.7-StopWordOption/ft-5.2.11-examples-q4 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Examples/3.4.3-ThesaurusOption/ft-3.4.3-examples-q3 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Examples/3.4.3-ThesaurusOption/ft-3.4.3-examples-q2 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Examples/3.4.3-ThesaurusOption/ft-3.4.3-examples-q1 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/MatchOptions/ftmatchoptions-q1 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/MatchOptions/ftmatchoptions-q2 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/MatchOptions/FTStopWord/ft-3.4.7-expressions-q5 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/MatchOptions/FTStopWord/ft-5.2.11-expressions-q8 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/MatchOptions/FTStopWord/ft-5.2.11-expressions-q7 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/MatchOptions/FTStopWord/ft-3.4.7-expressions-q4 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/MatchOptions/FTStopWord/ft-5.2.11-expressions-q4 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/MatchOptions/FTStopWord/ft-5.2.11-expressions-q9 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/MatchOptions/FTStopWord/ft-3.4.7-expressions-q9 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/MatchOptions/FTStopWord/ft-3.4.7-expressions-q6 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/MatchOptions/FTStopWord/ft-5.2.11-expressions-q2 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/MatchOptions/FTStopWord/ft-3.4.7-expressions-q8 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/MatchOptions/FTStopWord/ft-5.2.11-expressions-q6 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/MatchOptions/FTStopWord/ft-5.2.11-expressions-q5 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/MatchOptions/FTThesaurus/ft-3.4.3-expressions-q3 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/MatchOptions/FTThesaurus/ft-3.4.3-expressions-q6 909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/Expressions/Operators/CompExpr/FTContainsExpr/FTSelection/MatchOptions/FTThesaurus/ft-3.4.3-expressions-q5 909375)
+
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-FULL-TEXT-COMPOSABILITY/full-text-composability-queries-results-q3  909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-FULL-TEXT-COMPOSABILITY/full-text-composability-queries-results-q3b  909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-THESAURUS/thesaurus-queries-results-q4  909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-THESAURUS/thesaurus-queries-results-q2  909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-THESAURUS/thesaurus-queries-results-q4b  909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-THESAURUS/thesaurus-queries-results-q1b  909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-THESAURUS/thesaurus-queries-results-q5  909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-THESAURUS/thesaurus-queries-results-q3b  909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-THESAURUS/thesaurus-queries-results-q2b  909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-THESAURUS/thesaurus-queries-results-q6  909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-THESAURUS/thesaurus-queries-results-q3  909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-THESAURUS/thesaurus-queries-results-q1  909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-THESAURUS/thesaurus-queries-results-q5b  909375)
+    EXPECTED_FAILURE(test/rbkt/w3c_full_text_testsuite/XQueryX/UseCase/UseCase-THESAURUS/thesaurus-queries-results-q6b  909375)
+  ENDIF(ZORBA_TEST_XQUERYX)
+
+ENDIF (FOUND_XQFTTS AND NOT ZORBA_TEST_W3C_TO_SUBMIT_RESULTS)
+
 # The dirname_basename test depends on the system module
 #IF (NOT zorba_system_module_BINARY_DIR)
 #  EXPECTED_FAILURE (test/rbkt/zorba/file/dirname_basename ????need bugnum???)
 
=== modified file 'test/rbkt/Queries/w3c_known_failures.txt'
--- test/rbkt/Queries/w3c_known_failures.txt	2011-10-26 13:43:15 +0000
+++ test/rbkt/Queries/w3c_known_failures.txt	2012-01-26 09:42:31 +0000
@@ -1,123 +1,80 @@
+test/rbkt/w3c_testsuite/XQuery/SchemaValidation/ValidateExpression/validateexpr-28
+test/rbkt/w3c_testsuite/XQuery/StaticTyping/STFLWORExpr/ST-WhereExpr001
+test/rbkt/w3c_testsuite/XQuery/StaticTyping/STFLWORExpr/ST-PITest-02
+test/rbkt/w3c_testsuite/XQuery/StaticTyping/STFLWORExpr/ST-PITest-01
+test/rbkt/w3c_testsuite/XQuery/StaticTyping/STFunctions/ST-Data001
+test/rbkt/w3c_testsuite/XQuery/Basics/EQNames/eqname-013
 test/rbkt/w3c_testsuite/XQuery/PathExpr/Steps/Steps-leading-lone-slash-8a
-test/rbkt/w3c_testsuite/XQuery/FunctX/functx-fn-tokenize/functx-fn-tokenize-all
-test/rbkt/w3c_testsuite/XQuery/FunctX/functx-fn-tokenize/functx-fn-tokenize-7
-test/rbkt/w3c_testsuite/XQuery/FunctX/functx-fn-namespace-uri-for-prefix/functx-fn-namespace-uri-for-prefix-all
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-044
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-034
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-005
+test/rbkt/w3c_testsuite/XQuery/SchemaImport/SchemaImportProlog/modules-schema-context
+test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-904
+test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-031
 test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-037
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-011
+test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-047
+test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-007
+test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-028
+test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-018
+test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-036
+test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-008
 test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-024
 test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-046
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-021
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-019
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-018
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-001
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-003
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-004
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-031
+test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-038
+test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-049
 test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-017
 test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-913
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-043
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-040
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-045
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-027
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-006
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-023
+test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-021
+test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-015
 test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-029
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-916
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-014
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-032
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-002
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-047
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-912
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-918
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-015
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-013
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-009
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-030
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-035
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-025
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-012
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-007
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-041
 test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-039
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-042
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-008
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-020
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-016
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-904
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-917
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-915
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-022
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-038
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-010
 test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-914
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-033
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-036
-test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-028
+test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-030
+test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-009
+test/rbkt/w3c_testsuite/XQuery/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-7
+test/rbkt/w3c_testsuite/XQuery/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-8
 test/rbkt/w3c_testsuite/XQuery/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-10
-test/rbkt/w3c_testsuite/XQuery/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-8
-test/rbkt/w3c_testsuite/XQuery/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-7
-test/rbkt/w3c_testsuite/XQuery/Expressions/exprSeqTypes/SeqExprCast/CastFOCA0003-1
-test/rbkt/w3c_testsuite/XQuery/Expressions/exprSeqTypes/SeqExprCast/CastFOCA0001-1
-test/rbkt/w3c_testsuite/XQuery/Basics/EQNames/eqname-007
-test/rbkt/w3c_testsuite/XQuery/Modules/ModuleImport/modules-28
-test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch11
-test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/K2-MatchesFunc-5
-test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch08
-test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch10
-test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/K2-MatchesFunc-6
-test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch09
-test/rbkt/w3c_testsuite/XQuery/Functions/NodeSeqFunc/SeqCollectionFunc/fn-collection-2
+test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-001
+test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-002
+test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-007
+test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-902
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-004
+test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-901
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-903
-test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-007
-test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-001
-test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-002
+test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-005
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-006
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-003
-test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-005
-test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-902
-test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-901
+test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Filter/filter-903
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Filter/filter-902
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Filter/filter-004
-test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Filter/filter-903
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Filter/filter-005
+test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Filter/filter-003
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Filter/filter-901
-test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Filter/filter-003
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Filter/filter-002
+test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldLeft/fold-left-004
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldLeft/fold-left-003
+test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldLeft/fold-left-009
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldLeft/fold-left-002
+test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldLeft/fold-left-005
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldLeft/fold-left-008
-test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldLeft/fold-left-004
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldLeft/fold-left-001
-test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldLeft/fold-left-009
-test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldLeft/fold-left-005
-test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldRight/fold-right-005
+test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldRight/fold-right-004
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldRight/fold-right-001
-test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldRight/fold-right-004
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldRight/fold-right-002
+test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldRight/fold-right-005
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldRight/fold-right-003
-test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-006
-test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-002
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-007
-test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-901
-test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-003
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-005
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-001
+test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-902
+test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-003
+test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-006
+test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-901
+test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-002
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-008
-test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-902
-test/rbkt/w3c_testsuite/XQuery/Functions/QNameFunc/NamespaceURIForPrefixFunc/K2-NamespaceURIForPrefixFunc-2
-test/rbkt/w3c_testsuite/XQuery/SchemaValidation/ValidateExpression/validateexpr-28
+test/rbkt/w3c_testsuite/XQuery/FunctX/functx-fn-tokenize/functx-fn-tokenize-all
+test/rbkt/w3c_testsuite/XQuery/FunctX/functx-fn-tokenize/functx-fn-tokenize-7
+test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/K2-MatchesFunc-5
+test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch08
+test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/K2-MatchesFunc-6
+test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch09
+test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch10
+test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch11
 test/rbkt/w3c_testsuite/XQuery/exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWith/K2-ExternalVariablesWith-22
-test/rbkt/w3c_testsuite/XQuery/StaticTyping/STFLWORExpr/ST-PITest-02
-test/rbkt/w3c_testsuite/XQuery/StaticTyping/STFLWORExpr/ST-WhereExpr001
-test/rbkt/w3c_testsuite/XQuery/StaticTyping/STFLWORExpr/statictyping-24
-test/rbkt/w3c_testsuite/XQuery/StaticTyping/STFLWORExpr/ST-PITest-01
-test/rbkt/w3c_testsuite/XQuery/StaticTyping/STFunctions/ST-Data001
-test/rbkt/w3c_testsuite/XQuery/SchemaImport/SchemaImportProlog/modules-schema-context
-test/rbkt/w3c_testsuite/XQuery/Operators/CompExpr/ValComp/NumericComp/NumericLT/K2-NumericLT-2
-test/rbkt/w3c_testsuite/XQuery/Operators/CompExpr/ValComp/NumericComp/NumericLT/K2-NumericLT-1
-test/rbkt/w3c_testsuite/XQuery/Operators/CompExpr/ValComp/NumericComp/NumericGT/K2-NumericGT-2
-test/rbkt/w3c_testsuite/XQuery/Operators/CompExpr/ValComp/NumericComp/NumericGT/K2-NumericGT-1
 
=== added file 'test/rbkt/Queries/w3c_known_failures_XQueryX.txt'
--- test/rbkt/Queries/w3c_known_failures_XQueryX.txt	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/w3c_known_failures_XQueryX.txt	2012-01-26 09:42:31 +0000
@@ -0,0 +1,88 @@
+test/rbkt/w3c_testsuite/XQueryX/SchemaValidation/ValidateExpression/validateexpr-28
+test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STFLWORExpr/ST-PITest-02
+test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STFLWORExpr/ST-PITest-01
+test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STFLWORExpr/ST-WhereExpr001
+test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes012
+test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes011
+test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes013
+test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes014
+test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes015
+test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STFunctions/ST-Data001
+test/rbkt/w3c_testsuite/XQueryX/Basics/EQNames/eqname-013
+test/rbkt/w3c_testsuite/XQueryX/PathExpr/Steps/Steps-leading-lone-slash-8a
+test/rbkt/w3c_testsuite/XQueryX/SchemaImport/SchemaImportProlog/modules-schema-context
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-021
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-008
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-049
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-024
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-913
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-046
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-030
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-047
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-914
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-038
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-007
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-015
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-009
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-036
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-028
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-017
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-029
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-018
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-031
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-039
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-037
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-904
+test/rbkt/w3c_testsuite/XQueryX/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-8
+test/rbkt/w3c_testsuite/XQueryX/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-7
+test/rbkt/w3c_testsuite/XQueryX/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-10
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-005
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-006
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-903
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-003
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-007
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-001
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-901
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-002
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-004
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-902
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-003
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-002
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-903
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-901
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-902
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-004
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-005
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-008
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-001
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-003
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-002
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-004
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-009
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-005
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldRight/fold-right-005
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldRight/fold-right-002
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldRight/fold-right-004
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldRight/fold-right-001
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldRight/fold-right-003
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-901
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-008
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-005
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-006
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-007
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-003
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-002
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-902
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-001
+test/rbkt/w3c_testsuite/XQueryX/FunctX/functx-fn-tokenize/functx-fn-tokenize-7
+test/rbkt/w3c_testsuite/XQueryX/FunctX/functx-fn-tokenize/functx-fn-tokenize-all
+test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/K2-MatchesFunc-5
+test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch08
+test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch09
+test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/K2-MatchesFunc-6
+test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch11
+test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch10
+test/rbkt/w3c_testsuite/XQueryX/exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWith/K2-ExternalVariablesWith-22
+test/rbkt/w3c_testsuite/XQueryX/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-27
+test/rbkt/w3c_testsuite/XQueryX/Construct/DirectConElem/DirectConElemWhitespace/K2-DirectConElemWhitespace-25
+
 
=== modified file 'test/rbkt/Scripts/w3c/Readme.txt'
--- test/rbkt/Scripts/w3c/Readme.txt	2011-10-25 06:28:18 +0000
+++ test/rbkt/Scripts/w3c/Readme.txt	2012-01-26 09:42:31 +0000
@@ -18,8 +18,9 @@
     ZORBA_WITH_BIG_INTEGER=ON
     ZORBA_XQUERYX=ON
     ZORBA_TEST_XQUERYX=ON
+    ZORBA_TEST_W3C_TO_SUBMIT_RESULTS=ON
     All these options are set to OFF by default.
-
+    
 1.  Import XQTS/XQFTTS.
 
 2.  Use the "testdriver" to do the testing.
 
=== modified file 'test/rbkt/Scripts/w3c/Submit_xqts.cmake'
--- test/rbkt/Scripts/w3c/Submit_xqts.cmake	2011-10-25 08:43:51 +0000
+++ test/rbkt/Scripts/w3c/Submit_xqts.cmake	2012-01-26 09:42:31 +0000
@@ -29,7 +29,10 @@
 if (testdriver_mt)
   # Use the Test.xml generated by the testdriver_mt
   set (testfile "${builddir}/Testing/Test.xml")
-else ()
+endif ()
+
+#it might be that the testdriver_mt exists, but the user has chosen to generate the results with ctest(testdriver) instead of testdriver_mt
+if (NOT EXISTS "${testfile}")
   # Read most recent CTest tag and find out the corresponding Test.xml
   file (STRINGS "${builddir}/Testing/TAG" _tag_content)
   list (GET _tag_content 0 ctest_tag)
 
=== modified file 'test/rbkt/Scripts/w3c/generate-submission-xqftts.xq'
--- test/rbkt/Scripts/w3c/generate-submission-xqftts.xq	2011-12-21 14:40:33 +0000
+++ test/rbkt/Scripts/w3c/generate-submission-xqftts.xq	2012-01-26 09:42:31 +0000
@@ -11,7 +11,7 @@
     <test-suite-result>
       <implementation
         name="Zorba" 
-        version="2.1, 'Basileia'"
+        version="2.1 'Basileia'"
         anonymous-result-column="false">
       
      <organization         
@@ -61,11 +61,11 @@
 
     <syntax>XQuery</syntax>
 
-    <test-run dateRun="2011-11-28">
+    <test-run dateRun="2011-12-14">
       <test-suite version="current"/>
       <transformation><p>Standard</p></transformation>
       <comparison><p>Standard</p></comparison>
-      <otherComments><p>XQFTTS taken from W3C CVS as of 2011-11-28.</p></otherComments>
+      <otherComments><p>XQFTTS taken from W3C CVS as of 2011-12-09.</p></otherComments>
     </test-run>
 
     {
 
=== modified file 'test/rbkt/Scripts/w3c/generate-submission-xqts.xq'
--- test/rbkt/Scripts/w3c/generate-submission-xqts.xq	2011-11-09 14:01:12 +0000
+++ test/rbkt/Scripts/w3c/generate-submission-xqts.xq	2012-01-26 09:42:31 +0000
@@ -10,7 +10,7 @@
   validate {
   <test-suite-result>
       <implementation name="Zorba" 
-       version='2.0.3'
+       version="2.1 'Basileia'"
        anonymous-result-column="false">
       
       <organization
@@ -54,11 +54,11 @@
   
     <syntax>XQuery</syntax>
   
-    <test-run dateRun="2011-09-23">
+    <test-run dateRun="2011-12-09">
       <test-suite version="current"/>
       <transformation><p>Standard</p></transformation>
       <comparison><p>Standard</p></comparison>
-      <otherComments><p>XQTS taken from W3C CVS as of 2011-09-21.</p></otherComments>
+      <otherComments><p>XQTS taken from W3C CVS as of 2011-12-09.</p></otherComments>
     </test-run>
 
     {
 
=== modified file 'test/rbkt/Scripts/w3c/import_w3c_full_text_testsuite.sh'
--- test/rbkt/Scripts/w3c/import_w3c_full_text_testsuite.sh	2011-07-20 19:07:08 +0000
+++ test/rbkt/Scripts/w3c/import_w3c_full_text_testsuite.sh	2012-01-26 09:42:31 +0000
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 WORK_DEFAULT=/tmp
-XQTSURL_DEFAULT=http://dev.w3.org/2007/xpath-full-text-10-test-suite/XQFTTS_1_0_4.zip
+XQTSURL_DEFAULT=http://zorbatest.lambda.nu:8080/~spungi/XQFTTS_250112.zip
 
 die() {
   echo
 
=== modified file 'test/rbkt/Scripts/w3c/import_w3c_testsuite.sh'
--- test/rbkt/Scripts/w3c/import_w3c_testsuite.sh	2011-07-13 04:30:22 +0000
+++ test/rbkt/Scripts/w3c/import_w3c_testsuite.sh	2012-01-26 09:42:31 +0000
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 WORK_DEFAULT=/tmp
-XQTSURL_DEFAULT=http://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/XQTS_1_0_3.zip
+XQTSURL_DEFAULT=http://zorbatest.lambda.nu:8080/~spungi/XQTS_250112.zip
 
 die() {
   echo
 
=== modified file 'test/rbkt/testdriver_mt.cpp'
--- test/rbkt/testdriver_mt.cpp	2011-12-21 14:40:33 +0000
+++ test/rbkt/testdriver_mt.cpp	2012-01-26 09:42:31 +0000
@@ -1029,7 +1029,7 @@
       getline(knownFailuresFile, testname);
       knownFailures.insert(testname);
     }
-    queries.theOutput << "Loaded " << knownFailures.size() 
+    queries.theOutput << "Loaded " << (knownFailures.size()  -  1)
                       << " known failures" << std::endl << std::endl;
   }
 
 
=== modified file 'test/update/Scripts/Readme.txt'
--- test/update/Scripts/Readme.txt	2011-10-25 06:28:18 +0000
+++ test/update/Scripts/Readme.txt	2012-01-26 09:42:31 +0000
@@ -14,9 +14,12 @@
 #
 To generate a report for submitting to the W3C:
 
-0.  For submitting reports to W3C one should compile Zorba with ZORBA_WITH_BIG_INTEGER=ON.  
-    In order to generate the report for XQueryX compile Zorba by setting:
-    ZORBA_XQUERYX=ON and ZORBA_TEST_XQUERYX=ON. These options are set to OFF by default.
+0. For submitting reports to W3C one should compile Zorba with:
+    ZORBA_WITH_BIG_INTEGER=ON
+    ZORBA_XQUERYX=ON
+    ZORBA_TEST_XQUERYX=ON
+    ZORBA_TEST_W3C_TO_SUBMIT_RESULTS=ON
+    All these options are set to OFF by default.
 
 1.  Import XQUTS.
 
@@ -40,7 +43,7 @@
     Note that this assumes your build directory is ../../../build. If
     that is not true, specify the path to your build directory:
 
-    cmake -D ZORBA_BUILD_DIR=/path/to/build -P Submit.cmake > zorba-xquts-submission.xml
+    cmake -D ZORBA_BUILD_DIR=/path/to/build -P Submit_xquts.cmake > zorba-xquts-submission.xml
 
     The script depends on the XQUTS schema being located in
 
 
=== modified file 'test/update/Scripts/XQUTS.xml'
--- test/update/Scripts/XQUTS.xml	2011-10-07 08:28:43 +0000
+++ test/update/Scripts/XQUTS.xml	2012-01-26 09:42:31 +0000
@@ -22,7 +22,7 @@
     </implementation-defined-item>
     <implementation-defined-item  
       name="fnPutSemantics" 
-      value="fn:put stores a copy (preserving type, preserving namespaces, and inheriting namespace) of the given document or element in Zorba's store. That is it binds the node to the URI passed as first argument. If the URI is relative it's resolved against the base uri. The result of fn:put become effective at the end of the XQuery program or if they are applied using Zorba's made persistent.">
+      value="fn:put stores a copy (preserving type, preserving namespaces, and inheriting namespace) of the given document or element in Zorba's store. That is it binds the node to the URI passed as first argument. If the URI is relative it's resolved against the base uri. The result of fn:put become effective at the end of the XQuery program or if they are applied using Zorba's made persistent. Zorba does not implement fn:put() for attribute nodes.">
       <description last-mod="2008-11-05">The semantics of fn:put(), including the kinds of nodes
         accepted as operands by this function.</description>
     </implementation-defined-item>
 
=== modified file 'test/update/Scripts/generate-submission-xquts.xq'
--- test/update/Scripts/generate-submission-xquts.xq	2011-10-25 05:13:10 +0000
+++ test/update/Scripts/generate-submission-xquts.xq	2012-01-26 09:42:31 +0000
@@ -10,7 +10,7 @@
   validate {
     <test-suite-result>
        <implementation name="Zorba" 
-         version='2.0.3'
+         version="2.1 'Basileia'"
          anonymous-result-column="false">
   
       <organization
@@ -54,11 +54,11 @@
 
     <syntax>XQuery</syntax>
     
-    <test-run dateRun="2011-09-23">
+    <test-run dateRun="2011-12-14">
       <test-suite version="current"/>
       <transformation><p>Standard</p></transformation>
       <comparison><p>Standard</p></comparison>
-      <otherComments><p>XQUTS version taken from CVS as of 2011-09-21.</p></otherComments>
+      <otherComments><p>XQUTS version taken from CVS as of 2011-12-09.</p></otherComments>
     </test-run>
   
     {
@@ -67,12 +67,18 @@
       order by $testname
       return
       if(fn:exists(fn:index-of(('revalidation-declaration-01-fail','revalidation-declaration-03-fail','revalidation-declaration-05-fail','revalidate-valtrans-ins-003'
-      ,'fn-put-003-fail','fn-put-004-fail','fn-put-005-fail','fn-put-006-fail'),$testname))) then
+      ,'fn-put-003-fail','fn-put-004-fail','fn-put-006-fail'),$testname))) then
       <test-case
          name="{$testname}"
          result="not applicable"
          comment="This test was not run by Zorba: please consult the 'Guidelines for Running the XML Query Update Test Suite' for more details."
        />
+      else if (fn:exists(fn:index-of(('fn-put-005'),$testname))) then
+      <test-case
+         name="{$testname}"
+         result="not applicable"
+         comment="Zorba does not support fn:put() for attibute nodes."
+       />
       else if (fn:contains(fn:data($test),'StaticTypingFeature')) then
       <test-case
          name="{$testname}"
 
=== modified file 'test/update/Scripts/import_w3c_update_testsuite.sh'
--- test/update/Scripts/import_w3c_update_testsuite.sh	2011-07-06 05:58:39 +0000
+++ test/update/Scripts/import_w3c_update_testsuite.sh	2012-01-26 09:42:31 +0000
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 WORK_DEFAULT=/tmp
-XQUTSURL_DEFAULT=http://zorbatest.lambda.nu:8080/~spungi/XQUTS_070611.zip
+XQUTSURL_DEFAULT=http://zorbatest.lambda.nu:8080/~spungi/XQUTS_250112.zip
 
 die() {
   echo
 
=== added file 'test/update/Scripts/zorba-xquts-submission.xml'
--- test/update/Scripts/zorba-xquts-submission.xml	1970-01-01 00:00:00 +0000
+++ test/update/Scripts/zorba-xquts-submission.xml	2012-01-26 09:42:31 +0000
@@ -0,0 +1,858 @@
+<test-suite-result xmlns="http://www.w3.org/2005/02/query-test-XQTSResult">
+  <implementation name="Zorba" version="2.1 'Basileia'" anonymous-result-column="false">
+    <organization name="FLWOR Foundation" website="http://zorba-xquery.com/" anonymous="false"/>
+    <submittor name="Zorba Team" email="[e-mail]"/>
+    <description>
+      <p>Zorba is a general purpose XQuery processor implementing in C++
+        the W3C family of specifications. It is not an XML database.
+        The query processor has been designed to be embeddable in a
+        variety of environments such as other programming languages
+        extended with XML processing capabilities, browsers,
+        database servers, XML message dispatchers, or smartphones.
+        Its architecture employes a modular design, which allows customizing
+        the Zorba query processor to the environment’s needs.
+        For more details please check out http://www.zorba-xquery.com.</p>
+    </description>
+    <implementation-defined-items>
+      <implementation-defined-item name="supportedRevalidationModes" value="lax, skip, strict"/>
+      <implementation-defined-item name="defaultRevalidationMode" value="lax"/>
+      <implementation-defined-item name="externalFunctionXDMPUL" value="Zorba allows external functions to be implemented in C++. Such functions may return XDM instances. However, it is not possible to implement an updating external function."/>
+      <implementation-defined-item name="fnPutSemantics" value="fn:put stores a copy (preserving type, preserving namespaces, and inheriting namespace) of the given document or element in Zorba's store. That is it binds the node to the URI passed as first argument. If the URI is relative it's resolved against the base uri. The result of fn:put become effective at the end of the XQuery program or if they are applied using Zorba's made persistent. Zorba does not implement fn:put() for attribute nodes."/>
+    </implementation-defined-items>
+    <features>
+      <feature name="Minimal Conformance" supported="true"/>
+      <feature name="Update Facility Static Typing Feature" supported="false"/>
+    </features>
+    <context-properties>
+      <context-property name="Revalidation mode" value="lax" context-type="static"/>
+    </context-properties>
+  </implementation>
+  <syntax>XQuery</syntax>
+  <test-run dateRun="2011-12-14">
+    <test-suite version="current"/>
+    <transformation>
+      <p>Standard</p>
+    </transformation>
+    <comparison>
+      <p>Standard</p>
+    </comparison>
+    <otherComments>
+      <p>XQUTS version taken from CVS as of 2011-12-09.</p>
+    </otherComments>
+  </test-run>
+  <test-case name="address-book-q1" result="pass"/>
+  <test-case name="applyUpdates-001" result="pass"/>
+  <test-case name="applyUpdates-002" result="pass"/>
+  <test-case name="applyUpdates-003" result="pass"/>
+  <test-case name="applyUpdates-004" result="pass"/>
+  <test-case name="applyUpdates-005" result="pass"/>
+  <test-case name="applyUpdates-006" result="pass"/>
+  <test-case name="applyUpdates-007" result="pass"/>
+  <test-case name="applyUpdates-008" result="pass"/>
+  <test-case name="applyUpdates-009" result="pass"/>
+  <test-case name="applyUpdates-010" result="pass"/>
+  <test-case name="applyUpdates-011" result="pass"/>
+  <test-case name="applyUpdates-012" result="pass"/>
+  <test-case name="applyUpdates-013" result="pass"/>
+  <test-case name="applyUpdates-014" result="pass"/>
+  <test-case name="applyUpdates-016" result="pass"/>
+  <test-case name="applyUpdates-021" result="pass"/>
+  <test-case name="applyUpdates-022" result="pass"/>
+  <test-case name="applyUpdates-023" result="pass"/>
+  <test-case name="applyUpdates-024" result="pass"/>
+  <test-case name="applyUpdates-025" result="pass"/>
+  <test-case name="applyUpdates-026" result="pass"/>
+  <test-case name="attribute-errors-q1" result="pass"/>
+  <test-case name="attribute-errors-q10" result="pass"/>
+  <test-case name="attribute-errors-q11" result="pass"/>
+  <test-case name="attribute-errors-q12" result="pass"/>
+  <test-case name="attribute-errors-q13" result="pass"/>
+  <test-case name="attribute-errors-q14" result="pass"/>
+  <test-case name="attribute-errors-q15" result="pass"/>
+  <test-case name="attribute-errors-q16" result="pass"/>
+  <test-case name="attribute-errors-q17" result="pass"/>
+  <test-case name="attribute-errors-q2" result="pass"/>
+  <test-case name="attribute-errors-q3" result="pass"/>
+  <test-case name="attribute-errors-q4" result="pass"/>
+  <test-case name="attribute-errors-q5" result="pass"/>
+  <test-case name="attribute-errors-q6" result="pass"/>
+  <test-case name="attribute-errors-q7" result="pass"/>
+  <test-case name="attribute-errors-q8" result="pass"/>
+  <test-case name="attribute-errors-q9" result="pass"/>
+  <test-case name="compatibility-001" result="pass"/>
+  <test-case name="compatibility-002" result="pass"/>
+  <test-case name="compatibility-003" result="pass"/>
+  <test-case name="compatibility-004" result="pass"/>
+  <test-case name="compatibility-005" result="pass"/>
+  <test-case name="compatibility-006" result="pass"/>
+  <test-case name="compatibility-007" result="pass"/>
+  <test-case name="compatibility-008" result="pass"/>
+  <test-case name="compatibility-009" result="pass"/>
+  <test-case name="compatibility-010" result="pass"/>
+  <test-case name="compatibility-011" result="pass"/>
+  <test-case name="compatibility-012" result="pass"/>
+  <test-case name="compatibility-013" result="pass"/>
+  <test-case name="compatibility-014" result="pass"/>
+  <test-case name="compatibility-015" result="pass"/>
+  <test-case name="compatibility-016" result="pass"/>
+  <test-case name="compatibility-017" result="pass"/>
+  <test-case name="compatibility-018" result="pass"/>
+  <test-case name="compatibility-019" result="pass"/>
+  <test-case name="compatibility-020" result="pass"/>
+  <test-case name="compatibility-021" result="pass"/>
+  <test-case name="compatibility-022" result="pass"/>
+  <test-case name="compatibility-023" result="pass"/>
+  <test-case name="compatibility-024" result="pass"/>
+  <test-case name="compatibility-025" result="pass"/>
+  <test-case name="compatibility-026" result="pass"/>
+  <test-case name="compatibility-027" result="pass"/>
+  <test-case name="compatibility-028" result="pass"/>
+  <test-case name="compatibility-029" result="pass"/>
+  <test-case name="compatibility-030" result="pass"/>
+  <test-case name="complex-deletes-q1" result="pass"/>
+  <test-case name="complex-deletes-q10" result="pass"/>
+  <test-case name="complex-deletes-q11" result="pass"/>
+  <test-case name="complex-deletes-q12" result="pass"/>
+  <test-case name="complex-deletes-q13" result="pass"/>
+  <test-case name="complex-deletes-q14" result="pass"/>
+  <test-case name="complex-deletes-q2" result="pass"/>
+  <test-case name="complex-deletes-q3" result="pass"/>
+  <test-case name="complex-deletes-q4" result="pass"/>
+  <test-case name="complex-deletes-q5" result="pass"/>
+  <test-case name="complex-deletes-q6" result="pass"/>
+  <test-case name="complex-deletes-q7" result="pass"/>
+  <test-case name="complex-deletes-q8" result="pass"/>
+  <test-case name="complex-deletes-q9" result="pass"/>
+  <test-case name="complex-renames-q1" result="pass"/>
+  <test-case name="complex-renames-q2" result="pass"/>
+  <test-case name="complex-renames-q3" result="pass"/>
+  <test-case name="complex-renames-q4" result="pass"/>
+  <test-case name="complex-renames-q5" result="pass"/>
+  <test-case name="complex-renames-q6" result="pass"/>
+  <test-case name="complex-renames-q7" result="pass"/>
+  <test-case name="complex-renames-q8" result="pass"/>
+  <test-case name="complex-replacevalues-q1" result="pass"/>
+  <test-case name="complex-replacevalues-q10" result="pass"/>
+  <test-case name="complex-replacevalues-q11" result="pass"/>
+  <test-case name="complex-replacevalues-q12" result="pass"/>
+  <test-case name="complex-replacevalues-q13" result="pass"/>
+  <test-case name="complex-replacevalues-q14" result="pass"/>
+  <test-case name="complex-replacevalues-q2" result="pass"/>
+  <test-case name="complex-replacevalues-q3" result="pass"/>
+  <test-case name="complex-replacevalues-q4" result="pass"/>
+  <test-case name="complex-replacevalues-q5" result="pass"/>
+  <test-case name="complex-replacevalues-q6" result="pass"/>
+  <test-case name="complex-replacevalues-q7" result="pass"/>
+  <test-case name="complex-replacevalues-q8" result="pass"/>
+  <test-case name="complex-replacevalues-q9" result="pass"/>
+  <test-case name="fn-put-001" result="pass"/>
+  <test-case name="fn-put-002" result="pass"/>
+  <test-case name="fn-put-003" result="pass"/>
+  <test-case name="fn-put-003-fail" result="not applicable" comment="This test was not run by Zorba: please consult the 'Guidelines for Running the XML Query Update Test Suite' for more details."/>
+  <test-case name="fn-put-004" result="pass"/>
+  <test-case name="fn-put-004-fail" result="not applicable" comment="This test was not run by Zorba: please consult the 'Guidelines for Running the XML Query Update Test Suite' for more details."/>
+  <test-case name="fn-put-005" result="not applicable" comment="Zorba does not support fn:put() for attibute nodes."/>
+  <test-case name="fn-put-005-fail" result="pass"/>
+  <test-case name="fn-put-006" result="pass"/>
+  <test-case name="fn-put-006-fail" result="not applicable" comment="This test was not run by Zorba: please consult the 'Guidelines for Running the XML Query Update Test Suite' for more details."/>
+  <test-case name="fn-put-007" result="pass"/>
+  <test-case name="fn-put-008" result="pass"/>
+  <test-case name="fn-put-009" result="pass"/>
+  <test-case name="fn-put-010" result="pass"/>
+  <test-case name="fn-put-011" result="pass"/>
+  <test-case name="fn-put-012" result="pass"/>
+  <test-case name="fn-put-013" result="pass"/>
+  <test-case name="fn-put-014" result="pass"/>
+  <test-case name="function-declaration-01" result="pass"/>
+  <test-case name="function-declaration-02" result="pass"/>
+  <test-case name="function-declaration-03" result="pass"/>
+  <test-case name="function-declaration-04" result="pass"/>
+  <test-case name="id-comma-expr-01" result="pass"/>
+  <test-case name="id-comma-expr-010" result="pass"/>
+  <test-case name="id-comma-expr-011" result="pass"/>
+  <test-case name="id-comma-expr-012" result="pass"/>
+  <test-case name="id-comma-expr-013" result="pass"/>
+  <test-case name="id-comma-expr-014" result="pass"/>
+  <test-case name="id-comma-expr-015" result="pass"/>
+  <test-case name="id-comma-expr-016" result="pass"/>
+  <test-case name="id-comma-expr-017" result="pass"/>
+  <test-case name="id-comma-expr-018" result="pass"/>
+  <test-case name="id-comma-expr-019" result="pass"/>
+  <test-case name="id-comma-expr-02" result="pass"/>
+  <test-case name="id-comma-expr-020" result="pass"/>
+  <test-case name="id-comma-expr-021" result="pass"/>
+  <test-case name="id-comma-expr-022" result="pass"/>
+  <test-case name="id-comma-expr-023" result="pass"/>
+  <test-case name="id-comma-expr-024" result="pass"/>
+  <test-case name="id-comma-expr-025" result="pass"/>
+  <test-case name="id-comma-expr-026" result="pass"/>
+  <test-case name="id-comma-expr-027" result="pass"/>
+  <test-case name="id-comma-expr-028" result="pass"/>
+  <test-case name="id-comma-expr-029" result="pass"/>
+  <test-case name="id-comma-expr-03" result="pass"/>
+  <test-case name="id-comma-expr-030" result="pass"/>
+  <test-case name="id-comma-expr-031" result="pass"/>
+  <test-case name="id-comma-expr-032" result="pass"/>
+  <test-case name="id-comma-expr-033" result="pass"/>
+  <test-case name="id-comma-expr-034" result="pass"/>
+  <test-case name="id-comma-expr-035" result="pass"/>
+  <test-case name="id-comma-expr-036" result="pass"/>
+  <test-case name="id-comma-expr-037" result="pass"/>
+  <test-case name="id-comma-expr-038" result="pass"/>
+  <test-case name="id-comma-expr-04" result="pass"/>
+  <test-case name="id-comma-expr-05" result="pass"/>
+  <test-case name="id-comma-expr-06" result="pass"/>
+  <test-case name="id-comma-expr-07" result="pass"/>
+  <test-case name="id-comma-expr-08" result="pass"/>
+  <test-case name="id-comma-expr-09" result="pass"/>
+  <test-case name="id-conditional-expr-01" result="pass"/>
+  <test-case name="id-conditional-expr-010" result="pass"/>
+  <test-case name="id-conditional-expr-011" result="pass"/>
+  <test-case name="id-conditional-expr-012" result="pass"/>
+  <test-case name="id-conditional-expr-013" result="pass"/>
+  <test-case name="id-conditional-expr-014" result="pass"/>
+  <test-case name="id-conditional-expr-015" result="pass"/>
+  <test-case name="id-conditional-expr-016" result="pass"/>
+  <test-case name="id-conditional-expr-017" result="pass"/>
+  <test-case name="id-conditional-expr-018" result="pass"/>
+  <test-case name="id-conditional-expr-019" result="pass"/>
+  <test-case name="id-conditional-expr-02" result="pass"/>
+  <test-case name="id-conditional-expr-020" result="pass"/>
+  <test-case name="id-conditional-expr-021" result="pass"/>
+  <test-case name="id-conditional-expr-022" result="pass"/>
+  <test-case name="id-conditional-expr-023" result="pass"/>
+  <test-case name="id-conditional-expr-024" result="pass"/>
+  <test-case name="id-conditional-expr-025" result="pass"/>
+  <test-case name="id-conditional-expr-026" result="pass"/>
+  <test-case name="id-conditional-expr-027" result="pass"/>
+  <test-case name="id-conditional-expr-028" result="pass"/>
+  <test-case name="id-conditional-expr-029" result="pass"/>
+  <test-case name="id-conditional-expr-03" result="pass"/>
+  <test-case name="id-conditional-expr-030" result="pass"/>
+  <test-case name="id-conditional-expr-031" result="pass"/>
+  <test-case name="id-conditional-expr-032" result="pass"/>
+  <test-case name="id-conditional-expr-033" result="pass"/>
+  <test-case name="id-conditional-expr-034" result="pass"/>
+  <test-case name="id-conditional-expr-035" result="pass"/>
+  <test-case name="id-conditional-expr-036" result="pass"/>
+  <test-case name="id-conditional-expr-037" result="pass"/>
+  <test-case name="id-conditional-expr-038" result="pass"/>
+  <test-case name="id-conditional-expr-04" result="pass"/>
+  <test-case name="id-conditional-expr-05" result="pass"/>
+  <test-case name="id-conditional-expr-06" result="pass"/>
+  <test-case name="id-conditional-expr-07" result="pass"/>
+  <test-case name="id-conditional-expr-08" result="pass"/>
+  <test-case name="id-conditional-expr-09" result="pass"/>
+  <test-case name="id-delete-expr-01" result="pass"/>
+  <test-case name="id-delete-expr-010" result="pass"/>
+  <test-case name="id-delete-expr-011" result="pass"/>
+  <test-case name="id-delete-expr-012" result="pass"/>
+  <test-case name="id-delete-expr-013" result="pass"/>
+  <test-case name="id-delete-expr-014" result="pass"/>
+  <test-case name="id-delete-expr-015" result="pass"/>
+  <test-case name="id-delete-expr-016" result="pass"/>
+  <test-case name="id-delete-expr-017" result="pass"/>
+  <test-case name="id-delete-expr-018" result="pass"/>
+  <test-case name="id-delete-expr-019" result="pass"/>
+  <test-case name="id-delete-expr-02" result="pass"/>
+  <test-case name="id-delete-expr-020" result="pass"/>
+  <test-case name="id-delete-expr-021" result="pass"/>
+  <test-case name="id-delete-expr-022" result="pass"/>
+  <test-case name="id-delete-expr-03" result="pass"/>
+  <test-case name="id-delete-expr-04" result="pass"/>
+  <test-case name="id-delete-expr-05" result="pass"/>
+  <test-case name="id-delete-expr-06" result="pass"/>
+  <test-case name="id-delete-expr-07" result="pass"/>
+  <test-case name="id-delete-expr-08" result="pass"/>
+  <test-case name="id-delete-expr-09" result="pass"/>
+  <test-case name="id-flwor-expr-01" result="pass"/>
+  <test-case name="id-flwor-expr-010" result="pass"/>
+  <test-case name="id-flwor-expr-011" result="pass"/>
+  <test-case name="id-flwor-expr-012" result="pass"/>
+  <test-case name="id-flwor-expr-013" result="pass"/>
+  <test-case name="id-flwor-expr-014" result="pass"/>
+  <test-case name="id-flwor-expr-015" result="pass"/>
+  <test-case name="id-flwor-expr-016" result="pass"/>
+  <test-case name="id-flwor-expr-017" result="pass"/>
+  <test-case name="id-flwor-expr-018" result="pass"/>
+  <test-case name="id-flwor-expr-019" result="pass"/>
+  <test-case name="id-flwor-expr-02" result="pass"/>
+  <test-case name="id-flwor-expr-020" result="pass"/>
+  <test-case name="id-flwor-expr-021" result="pass"/>
+  <test-case name="id-flwor-expr-022" result="pass"/>
+  <test-case name="id-flwor-expr-023" result="pass"/>
+  <test-case name="id-flwor-expr-024" result="pass"/>
+  <test-case name="id-flwor-expr-025" result="pass"/>
+  <test-case name="id-flwor-expr-03" result="pass"/>
+  <test-case name="id-flwor-expr-04" result="pass"/>
+  <test-case name="id-flwor-expr-05" result="pass"/>
+  <test-case name="id-flwor-expr-06" result="pass"/>
+  <test-case name="id-flwor-expr-07" result="pass"/>
+  <test-case name="id-flwor-expr-08" result="pass"/>
+  <test-case name="id-flwor-expr-09" result="pass"/>
+  <test-case name="id-function-call-01" result="pass"/>
+  <test-case name="id-function-call-02" result="pass"/>
+  <test-case name="id-function-call-03" result="pass"/>
+  <test-case name="id-function-call-04" result="pass"/>
+  <test-case name="id-function-call-05" result="pass"/>
+  <test-case name="id-function-call-06" result="pass"/>
+  <test-case name="id-function-declaration-01" result="pass"/>
+  <test-case name="id-function-declaration-010" result="pass"/>
+  <test-case name="id-function-declaration-011" result="pass"/>
+  <test-case name="id-function-declaration-012" result="pass"/>
+  <test-case name="id-function-declaration-013" result="pass"/>
+  <test-case name="id-function-declaration-014" result="pass"/>
+  <test-case name="id-function-declaration-015" result="pass"/>
+  <test-case name="id-function-declaration-016" result="pass"/>
+  <test-case name="id-function-declaration-017" result="pass"/>
+  <test-case name="id-function-declaration-02" result="pass"/>
+  <test-case name="id-function-declaration-03" result="pass"/>
+  <test-case name="id-function-declaration-04" result="pass"/>
+  <test-case name="id-function-declaration-05" result="pass"/>
+  <test-case name="id-function-declaration-06" result="pass"/>
+  <test-case name="id-function-declaration-07" result="pass"/>
+  <test-case name="id-function-declaration-08" result="pass"/>
+  <test-case name="id-function-declaration-09" result="pass"/>
+  <test-case name="id-insert-expr-01" result="pass"/>
+  <test-case name="id-insert-expr-010" result="pass"/>
+  <test-case name="id-insert-expr-011" result="pass"/>
+  <test-case name="id-insert-expr-012" result="pass"/>
+  <test-case name="id-insert-expr-013" result="pass"/>
+  <test-case name="id-insert-expr-014" result="pass"/>
+  <test-case name="id-insert-expr-015" result="pass"/>
+  <test-case name="id-insert-expr-016" result="pass"/>
+  <test-case name="id-insert-expr-017" result="pass"/>
+  <test-case name="id-insert-expr-018" result="pass"/>
+  <test-case name="id-insert-expr-019" result="pass"/>
+  <test-case name="id-insert-expr-02" result="pass"/>
+  <test-case name="id-insert-expr-020" result="pass"/>
+  <test-case name="id-insert-expr-021" result="pass"/>
+  <test-case name="id-insert-expr-022" result="pass"/>
+  <test-case name="id-insert-expr-023" result="pass"/>
+  <test-case name="id-insert-expr-024" result="pass"/>
+  <test-case name="id-insert-expr-025" result="pass"/>
+  <test-case name="id-insert-expr-026" result="pass"/>
+  <test-case name="id-insert-expr-027" result="pass"/>
+  <test-case name="id-insert-expr-028" result="pass"/>
+  <test-case name="id-insert-expr-029" result="pass"/>
+  <test-case name="id-insert-expr-03" result="pass"/>
+  <test-case name="id-insert-expr-030" result="pass"/>
+  <test-case name="id-insert-expr-031" result="pass"/>
+  <test-case name="id-insert-expr-032" result="pass"/>
+  <test-case name="id-insert-expr-033" result="pass"/>
+  <test-case name="id-insert-expr-034" result="pass"/>
+  <test-case name="id-insert-expr-035" result="pass"/>
+  <test-case name="id-insert-expr-036" result="pass"/>
+  <test-case name="id-insert-expr-037" result="pass"/>
+  <test-case name="id-insert-expr-038" result="pass"/>
+  <test-case name="id-insert-expr-039" result="pass"/>
+  <test-case name="id-insert-expr-04" result="pass"/>
+  <test-case name="id-insert-expr-040" result="pass"/>
+  <test-case name="id-insert-expr-041" result="pass"/>
+  <test-case name="id-insert-expr-042" result="pass"/>
+  <test-case name="id-insert-expr-043" result="pass"/>
+  <test-case name="id-insert-expr-044" result="pass"/>
+  <test-case name="id-insert-expr-045" result="pass"/>
+  <test-case name="id-insert-expr-046" result="pass"/>
+  <test-case name="id-insert-expr-047" result="pass"/>
+  <test-case name="id-insert-expr-048" result="pass"/>
+  <test-case name="id-insert-expr-049" result="pass"/>
+  <test-case name="id-insert-expr-05" result="pass"/>
+  <test-case name="id-insert-expr-050" result="pass"/>
+  <test-case name="id-insert-expr-051" result="pass"/>
+  <test-case name="id-insert-expr-052" result="pass"/>
+  <test-case name="id-insert-expr-053" result="pass"/>
+  <test-case name="id-insert-expr-054" result="pass"/>
+  <test-case name="id-insert-expr-055" result="pass"/>
+  <test-case name="id-insert-expr-056" result="pass"/>
+  <test-case name="id-insert-expr-057" result="pass"/>
+  <test-case name="id-insert-expr-058" result="pass"/>
+  <test-case name="id-insert-expr-059" result="pass"/>
+  <test-case name="id-insert-expr-06" result="pass"/>
+  <test-case name="id-insert-expr-060" result="pass"/>
+  <test-case name="id-insert-expr-061" result="pass"/>
+  <test-case name="id-insert-expr-062" result="pass"/>
+  <test-case name="id-insert-expr-063" result="pass"/>
+  <test-case name="id-insert-expr-064" result="pass"/>
+  <test-case name="id-insert-expr-065" result="pass"/>
+  <test-case name="id-insert-expr-066" result="pass"/>
+  <test-case name="id-insert-expr-067" result="pass"/>
+  <test-case name="id-insert-expr-068" result="pass"/>
+  <test-case name="id-insert-expr-069" result="pass"/>
+  <test-case name="id-insert-expr-07" result="pass"/>
+  <test-case name="id-insert-expr-070" result="pass"/>
+  <test-case name="id-insert-expr-071" result="pass"/>
+  <test-case name="id-insert-expr-072" result="pass"/>
+  <test-case name="id-insert-expr-073" result="pass"/>
+  <test-case name="id-insert-expr-074" result="pass"/>
+  <test-case name="id-insert-expr-075" result="pass"/>
+  <test-case name="id-insert-expr-076" result="pass"/>
+  <test-case name="id-insert-expr-077" result="pass"/>
+  <test-case name="id-insert-expr-078" result="pass"/>
+  <test-case name="id-insert-expr-079" result="pass"/>
+  <test-case name="id-insert-expr-08" result="pass"/>
+  <test-case name="id-insert-expr-080" result="pass"/>
+  <test-case name="id-insert-expr-081" result="pass"/>
+  <test-case name="id-insert-expr-081-no-inherit" result="pass"/>
+  <test-case name="id-insert-expr-082" result="pass"/>
+  <test-case name="id-insert-expr-082-no-inherit" result="pass"/>
+  <test-case name="id-insert-expr-083" result="pass"/>
+  <test-case name="id-insert-expr-083-no-inherit" result="pass"/>
+  <test-case name="id-insert-expr-084" result="pass"/>
+  <test-case name="id-insert-expr-084-no-inherit" result="pass"/>
+  <test-case name="id-insert-expr-085" result="pass"/>
+  <test-case name="id-insert-expr-085-no-inherit" result="pass"/>
+  <test-case name="id-insert-expr-086" result="pass"/>
+  <test-case name="id-insert-expr-086-no-inherit" result="pass"/>
+  <test-case name="id-insert-expr-087" result="pass"/>
+  <test-case name="id-insert-expr-088" result="pass"/>
+  <test-case name="id-insert-expr-089" result="pass"/>
+  <test-case name="id-insert-expr-09" result="pass"/>
+  <test-case name="id-insert-expr-090" result="pass"/>
+  <test-case name="id-insert-expr-091" result="pass"/>
+  <test-case name="id-insert-expr-092" result="pass"/>
+  <test-case name="id-insert-expr-093" result="pass"/>
+  <test-case name="id-insert-expr-094" result="pass"/>
+  <test-case name="id-other-expr-01" result="pass"/>
+  <test-case name="id-other-expr-010" result="pass"/>
+  <test-case name="id-other-expr-011" result="pass"/>
+  <test-case name="id-other-expr-012" result="pass"/>
+  <test-case name="id-other-expr-013" result="pass"/>
+  <test-case name="id-other-expr-014" result="pass"/>
+  <test-case name="id-other-expr-015" result="pass"/>
+  <test-case name="id-other-expr-016" result="pass"/>
+  <test-case name="id-other-expr-017" result="pass"/>
+  <test-case name="id-other-expr-018" result="pass"/>
+  <test-case name="id-other-expr-019" result="pass"/>
+  <test-case name="id-other-expr-02" result="pass"/>
+  <test-case name="id-other-expr-020" result="pass"/>
+  <test-case name="id-other-expr-021" result="pass"/>
+  <test-case name="id-other-expr-022" result="pass"/>
+  <test-case name="id-other-expr-023" result="pass"/>
+  <test-case name="id-other-expr-024" result="pass"/>
+  <test-case name="id-other-expr-025" result="pass"/>
+  <test-case name="id-other-expr-027" result="pass"/>
+  <test-case name="id-other-expr-028" result="pass"/>
+  <test-case name="id-other-expr-029" result="pass"/>
+  <test-case name="id-other-expr-03" result="pass"/>
+  <test-case name="id-other-expr-030" result="pass"/>
+  <test-case name="id-other-expr-031" result="pass"/>
+  <test-case name="id-other-expr-032" result="pass"/>
+  <test-case name="id-other-expr-04" result="pass"/>
+  <test-case name="id-other-expr-05" result="pass"/>
+  <test-case name="id-other-expr-06" result="pass"/>
+  <test-case name="id-other-expr-07" result="pass"/>
+  <test-case name="id-other-expr-08" result="pass"/>
+  <test-case name="id-other-expr-09" result="pass"/>
+  <test-case name="id-other-expr-26" result="pass"/>
+  <test-case name="id-rename-expr-01" result="pass"/>
+  <test-case name="id-rename-expr-010" result="pass"/>
+  <test-case name="id-rename-expr-011" result="pass"/>
+  <test-case name="id-rename-expr-012" result="pass"/>
+  <test-case name="id-rename-expr-013" result="pass"/>
+  <test-case name="id-rename-expr-014" result="pass"/>
+  <test-case name="id-rename-expr-015" result="pass"/>
+  <test-case name="id-rename-expr-016" result="pass"/>
+  <test-case name="id-rename-expr-017" result="pass"/>
+  <test-case name="id-rename-expr-018" result="pass"/>
+  <test-case name="id-rename-expr-019" result="pass"/>
+  <test-case name="id-rename-expr-02" result="pass"/>
+  <test-case name="id-rename-expr-020" result="pass"/>
+  <test-case name="id-rename-expr-021" result="pass"/>
+  <test-case name="id-rename-expr-022" result="pass"/>
+  <test-case name="id-rename-expr-023" result="pass"/>
+  <test-case name="id-rename-expr-024" result="pass"/>
+  <test-case name="id-rename-expr-025" result="pass"/>
+  <test-case name="id-rename-expr-026" result="pass"/>
+  <test-case name="id-rename-expr-027" result="pass"/>
+  <test-case name="id-rename-expr-028" result="pass"/>
+  <test-case name="id-rename-expr-029" result="pass"/>
+  <test-case name="id-rename-expr-03" result="pass"/>
+  <test-case name="id-rename-expr-030" result="pass"/>
+  <test-case name="id-rename-expr-031" result="pass"/>
+  <test-case name="id-rename-expr-032" result="pass"/>
+  <test-case name="id-rename-expr-033" result="pass"/>
+  <test-case name="id-rename-expr-033-no-inherit" result="pass"/>
+  <test-case name="id-rename-expr-034" result="pass"/>
+  <test-case name="id-rename-expr-034-no-inherit" result="pass"/>
+  <test-case name="id-rename-expr-035" result="pass"/>
+  <test-case name="id-rename-expr-036" result="pass"/>
+  <test-case name="id-rename-expr-037" result="pass"/>
+  <test-case name="id-rename-expr-04" result="pass"/>
+  <test-case name="id-rename-expr-05" result="pass"/>
+  <test-case name="id-rename-expr-06" result="pass"/>
+  <test-case name="id-rename-expr-07" result="pass"/>
+  <test-case name="id-rename-expr-08" result="pass"/>
+  <test-case name="id-rename-expr-09" result="pass"/>
+  <test-case name="id-replace-expr-01" result="pass"/>
+  <test-case name="id-replace-expr-010" result="pass"/>
+  <test-case name="id-replace-expr-011" result="pass"/>
+  <test-case name="id-replace-expr-012" result="pass"/>
+  <test-case name="id-replace-expr-013" result="pass"/>
+  <test-case name="id-replace-expr-014" result="pass"/>
+  <test-case name="id-replace-expr-015" result="pass"/>
+  <test-case name="id-replace-expr-016" result="pass"/>
+  <test-case name="id-replace-expr-017" result="pass"/>
+  <test-case name="id-replace-expr-018" result="pass"/>
+  <test-case name="id-replace-expr-019" result="pass"/>
+  <test-case name="id-replace-expr-02" result="pass"/>
+  <test-case name="id-replace-expr-020" result="pass"/>
+  <test-case name="id-replace-expr-021" result="pass"/>
+  <test-case name="id-replace-expr-022" result="pass"/>
+  <test-case name="id-replace-expr-023" result="pass"/>
+  <test-case name="id-replace-expr-024" result="pass"/>
+  <test-case name="id-replace-expr-025" result="pass"/>
+  <test-case name="id-replace-expr-026" result="pass"/>
+  <test-case name="id-replace-expr-027" result="pass"/>
+  <test-case name="id-replace-expr-028" result="pass"/>
+  <test-case name="id-replace-expr-029" result="pass"/>
+  <test-case name="id-replace-expr-03" result="pass"/>
+  <test-case name="id-replace-expr-030" result="pass"/>
+  <test-case name="id-replace-expr-031" result="pass"/>
+  <test-case name="id-replace-expr-032" result="pass"/>
+  <test-case name="id-replace-expr-033" result="pass"/>
+  <test-case name="id-replace-expr-034" result="pass"/>
+  <test-case name="id-replace-expr-035" result="pass"/>
+  <test-case name="id-replace-expr-036" result="pass"/>
+  <test-case name="id-replace-expr-037" result="pass"/>
+  <test-case name="id-replace-expr-038" result="pass"/>
+  <test-case name="id-replace-expr-039" result="pass"/>
+  <test-case name="id-replace-expr-04" result="pass"/>
+  <test-case name="id-replace-expr-040" result="pass"/>
+  <test-case name="id-replace-expr-041" result="pass"/>
+  <test-case name="id-replace-expr-042" result="pass"/>
+  <test-case name="id-replace-expr-043" result="pass"/>
+  <test-case name="id-replace-expr-044" result="pass"/>
+  <test-case name="id-replace-expr-045" result="pass"/>
+  <test-case name="id-replace-expr-045-no-inherit" result="pass"/>
+  <test-case name="id-replace-expr-05" result="pass"/>
+  <test-case name="id-replace-expr-06" result="pass"/>
+  <test-case name="id-replace-expr-07" result="pass"/>
+  <test-case name="id-replace-expr-08" result="pass"/>
+  <test-case name="id-replace-expr-09" result="pass"/>
+  <test-case name="id-transform-expr-01" result="pass"/>
+  <test-case name="id-transform-expr-010" result="pass"/>
+  <test-case name="id-transform-expr-011" result="pass"/>
+  <test-case name="id-transform-expr-012" result="pass"/>
+  <test-case name="id-transform-expr-013" result="pass"/>
+  <test-case name="id-transform-expr-014" result="pass"/>
+  <test-case name="id-transform-expr-015" result="pass"/>
+  <test-case name="id-transform-expr-016" result="pass"/>
+  <test-case name="id-transform-expr-017" result="pass"/>
+  <test-case name="id-transform-expr-018" result="pass"/>
+  <test-case name="id-transform-expr-019" result="pass"/>
+  <test-case name="id-transform-expr-02" result="pass"/>
+  <test-case name="id-transform-expr-020" result="pass"/>
+  <test-case name="id-transform-expr-021" result="pass"/>
+  <test-case name="id-transform-expr-022" result="pass"/>
+  <test-case name="id-transform-expr-023" result="pass"/>
+  <test-case name="id-transform-expr-024" result="pass"/>
+  <test-case name="id-transform-expr-025" result="pass"/>
+  <test-case name="id-transform-expr-026" result="pass"/>
+  <test-case name="id-transform-expr-027" result="pass"/>
+  <test-case name="id-transform-expr-028" result="pass"/>
+  <test-case name="id-transform-expr-029" result="pass"/>
+  <test-case name="id-transform-expr-03" result="pass"/>
+  <test-case name="id-transform-expr-030" result="pass"/>
+  <test-case name="id-transform-expr-031" result="pass"/>
+  <test-case name="id-transform-expr-032" result="pass"/>
+  <test-case name="id-transform-expr-033" result="pass"/>
+  <test-case name="id-transform-expr-034" result="pass"/>
+  <test-case name="id-transform-expr-035" result="pass"/>
+  <test-case name="id-transform-expr-036" result="pass"/>
+  <test-case name="id-transform-expr-037" result="pass"/>
+  <test-case name="id-transform-expr-038" result="pass"/>
+  <test-case name="id-transform-expr-039" result="pass"/>
+  <test-case name="id-transform-expr-04" result="pass"/>
+  <test-case name="id-transform-expr-040" result="pass"/>
+  <test-case name="id-transform-expr-041" result="pass"/>
+  <test-case name="id-transform-expr-042" result="pass"/>
+  <test-case name="id-transform-expr-043" result="pass"/>
+  <test-case name="id-transform-expr-044" result="pass"/>
+  <test-case name="id-transform-expr-045" result="pass"/>
+  <test-case name="id-transform-expr-046" result="pass"/>
+  <test-case name="id-transform-expr-047" result="pass"/>
+  <test-case name="id-transform-expr-048" result="pass"/>
+  <test-case name="id-transform-expr-049" result="pass"/>
+  <test-case name="id-transform-expr-05" result="pass"/>
+  <test-case name="id-transform-expr-050" result="pass"/>
+  <test-case name="id-transform-expr-051" result="pass"/>
+  <test-case name="id-transform-expr-052" result="pass"/>
+  <test-case name="id-transform-expr-053" result="pass"/>
+  <test-case name="id-transform-expr-054" result="pass"/>
+  <test-case name="id-transform-expr-055" result="pass"/>
+  <test-case name="id-transform-expr-056" result="pass"/>
+  <test-case name="id-transform-expr-057" result="pass"/>
+  <test-case name="id-transform-expr-058" result="pass"/>
+  <test-case name="id-transform-expr-06" result="pass"/>
+  <test-case name="id-transform-expr-07" result="pass"/>
+  <test-case name="id-transform-expr-08" result="pass"/>
+  <test-case name="id-transform-expr-09" result="pass"/>
+  <test-case name="id-typeswitch-expr-01" result="pass"/>
+  <test-case name="id-typeswitch-expr-010" result="pass"/>
+  <test-case name="id-typeswitch-expr-011" result="pass"/>
+  <test-case name="id-typeswitch-expr-012" result="pass"/>
+  <test-case name="id-typeswitch-expr-013" result="pass"/>
+  <test-case name="id-typeswitch-expr-014" result="pass"/>
+  <test-case name="id-typeswitch-expr-015" result="pass"/>
+  <test-case name="id-typeswitch-expr-016" result="pass"/>
+  <test-case name="id-typeswitch-expr-017" result="pass"/>
+  <test-case name="id-typeswitch-expr-018" result="pass"/>
+  <test-case name="id-typeswitch-expr-019" result="pass"/>
+  <test-case name="id-typeswitch-expr-02" result="pass"/>
+  <test-case name="id-typeswitch-expr-020" result="pass"/>
+  <test-case name="id-typeswitch-expr-021" result="pass"/>
+  <test-case name="id-typeswitch-expr-022" result="pass"/>
+  <test-case name="id-typeswitch-expr-023" result="pass"/>
+  <test-case name="id-typeswitch-expr-024" result="pass"/>
+  <test-case name="id-typeswitch-expr-025" result="pass"/>
+  <test-case name="id-typeswitch-expr-026" result="pass"/>
+  <test-case name="id-typeswitch-expr-027" result="pass"/>
+  <test-case name="id-typeswitch-expr-028" result="pass"/>
+  <test-case name="id-typeswitch-expr-029" result="pass"/>
+  <test-case name="id-typeswitch-expr-03" result="pass"/>
+  <test-case name="id-typeswitch-expr-030" result="pass"/>
+  <test-case name="id-typeswitch-expr-031" result="pass"/>
+  <test-case name="id-typeswitch-expr-032" result="pass"/>
+  <test-case name="id-typeswitch-expr-033" result="pass"/>
+  <test-case name="id-typeswitch-expr-034" result="pass"/>
+  <test-case name="id-typeswitch-expr-035" result="pass"/>
+  <test-case name="id-typeswitch-expr-036" result="pass"/>
+  <test-case name="id-typeswitch-expr-037" result="pass"/>
+  <test-case name="id-typeswitch-expr-038" result="pass"/>
+  <test-case name="id-typeswitch-expr-04" result="pass"/>
+  <test-case name="id-typeswitch-expr-05" result="pass"/>
+  <test-case name="id-typeswitch-expr-06" result="pass"/>
+  <test-case name="id-typeswitch-expr-07" result="pass"/>
+  <test-case name="id-typeswitch-expr-08" result="pass"/>
+  <test-case name="id-typeswitch-expr-09" result="pass"/>
+  <test-case name="mergeUpdates-001" result="pass"/>
+  <test-case name="mergeUpdates-002" result="pass"/>
+  <test-case name="namespace-errors-q1" result="pass"/>
+  <test-case name="namespace-errors-q10" result="pass"/>
+  <test-case name="namespace-errors-q11" result="pass"/>
+  <test-case name="namespace-errors-q12" result="pass"/>
+  <test-case name="namespace-errors-q13" result="pass"/>
+  <test-case name="namespace-errors-q14" result="pass"/>
+  <test-case name="namespace-errors-q15" result="pass"/>
+  <test-case name="namespace-errors-q16" result="pass"/>
+  <test-case name="namespace-errors-q17" result="pass"/>
+  <test-case name="namespace-errors-q18" result="pass"/>
+  <test-case name="namespace-errors-q19" result="pass"/>
+  <test-case name="namespace-errors-q2" result="pass"/>
+  <test-case name="namespace-errors-q3" result="pass"/>
+  <test-case name="namespace-errors-q4" result="pass"/>
+  <test-case name="namespace-errors-q5" result="pass"/>
+  <test-case name="namespace-errors-q6" result="pass"/>
+  <test-case name="namespace-errors-q7" result="pass"/>
+  <test-case name="namespace-errors-q8" result="pass"/>
+  <test-case name="namespace-errors-q9" result="pass"/>
+  <test-case name="namespaces-q1" result="pass"/>
+  <test-case name="nil-q1" result="pass"/>
+  <test-case name="parenthesized-expr-01" result="pass"/>
+  <test-case name="parenthesized-expr-02" result="pass"/>
+  <test-case name="parenthesized-expr-03" result="pass"/>
+  <test-case name="parts-q1" result="pass"/>
+  <test-case name="parts-q2" result="pass"/>
+  <test-case name="parts-q3-1" result="pass"/>
+  <test-case name="parts-q3-2" result="pass"/>
+  <test-case name="parts-q4-1" result="pass"/>
+  <test-case name="parts-q4-2" result="pass"/>
+  <test-case name="parts-q6" result="pass"/>
+  <test-case name="propagateNamespaces01" result="pass"/>
+  <test-case name="propagateNamespaces02" result="pass"/>
+  <test-case name="propagateNamespaces03" result="pass"/>
+  <test-case name="propagateNamespaces04" result="pass"/>
+  <test-case name="propagateNamespaces05" result="pass"/>
+  <test-case name="propagateNamespaces06" result="pass"/>
+  <test-case name="put-001" result="pass"/>
+  <test-case name="relational-data-q1" result="pass"/>
+  <test-case name="relational-data-q2" result="pass"/>
+  <test-case name="relational-data-q3" result="pass"/>
+  <test-case name="relational-data-q4" result="pass"/>
+  <test-case name="relational-data-q5-1" result="pass"/>
+  <test-case name="relational-data-q5-2" result="pass"/>
+  <test-case name="relational-data-q6-1" result="pass"/>
+  <test-case name="relational-data-q6-2" result="pass"/>
+  <test-case name="relational-data-q7" result="pass"/>
+  <test-case name="relational-data-q8" result="pass"/>
+  <test-case name="relational-data-q9" result="pass"/>
+  <test-case name="removeType-valskip-del-001" result="pass"/>
+  <test-case name="removeType-valskip-del-002" result="pass"/>
+  <test-case name="removeType-valskip-del-003" result="pass"/>
+  <test-case name="removeType-valskip-del-004" result="pass"/>
+  <test-case name="removeType-valskip-del-005" result="pass"/>
+  <test-case name="removeType-valskip-ins-001" result="pass"/>
+  <test-case name="removeType-valskip-ins-002" result="pass"/>
+  <test-case name="removeType-valskip-ins-003" result="pass"/>
+  <test-case name="removeType-valskip-ins-004" result="pass"/>
+  <test-case name="removeType-valskip-ins-005" result="pass"/>
+  <test-case name="removeType-valskip-ins-006" result="pass"/>
+  <test-case name="removeType-valskip-ins-007" result="pass"/>
+  <test-case name="removeType-valskip-ins-008" result="pass"/>
+  <test-case name="removeType-valskip-ins-009" result="pass"/>
+  <test-case name="removeType-valskip-ins-010" result="pass"/>
+  <test-case name="removeType-valskip-ins-011" result="pass"/>
+  <test-case name="removeType-valskip-ins-012" result="pass"/>
+  <test-case name="removeType-valskip-ins-013" result="pass"/>
+  <test-case name="removeType-valskip-ins-014" result="pass"/>
+  <test-case name="removeType-valskip-ren-001" result="pass"/>
+  <test-case name="removeType-valskip-ren-002" result="pass"/>
+  <test-case name="removeType-valskip-ren-003" result="pass"/>
+  <test-case name="removeType-valskip-ren-004" result="pass"/>
+  <test-case name="removeType-valskip-ren-005" result="pass"/>
+  <test-case name="removeType-valskip-ren-006" result="pass"/>
+  <test-case name="removeType-valskip-repnode-001" result="pass"/>
+  <test-case name="removeType-valskip-repnode-002" result="pass"/>
+  <test-case name="removeType-valskip-repnode-003" result="pass"/>
+  <test-case name="removeType-valskip-repnode-004" result="pass"/>
+  <test-case name="removeType-valskip-repnode-005" result="pass"/>
+  <test-case name="removeType-valskip-repnode-006" result="pass"/>
+  <test-case name="revalidate-vallax-del-001" result="pass"/>
+  <test-case name="revalidate-vallax-del-002" result="pass"/>
+  <test-case name="revalidate-vallax-del-003" result="pass"/>
+  <test-case name="revalidate-vallax-del-004" result="pass"/>
+  <test-case name="revalidate-vallax-ins-001" result="pass"/>
+  <test-case name="revalidate-vallax-ins-002" result="pass"/>
+  <test-case name="revalidate-vallax-ins-003" result="pass"/>
+  <test-case name="revalidate-vallax-ins-004" result="pass"/>
+  <test-case name="revalidate-vallax-ins-005" result="pass"/>
+  <test-case name="revalidate-vallax-ins-006" result="pass"/>
+  <test-case name="revalidate-vallax-ins-007" result="pass"/>
+  <test-case name="revalidate-vallax-ren-001" result="pass"/>
+  <test-case name="revalidate-vallax-ren-002" result="pass"/>
+  <test-case name="revalidate-vallax-ren-003" result="pass"/>
+  <test-case name="revalidate-vallax-repnode-001" result="pass"/>
+  <test-case name="revalidate-vallax-repnode-002" result="pass"/>
+  <test-case name="revalidate-vallax-repnode-003" result="pass"/>
+  <test-case name="revalidate-valstrict-del-001" result="pass"/>
+  <test-case name="revalidate-valstrict-del-002" result="pass"/>
+  <test-case name="revalidate-valstrict-del-003" result="pass"/>
+  <test-case name="revalidate-valstrict-del-004" result="pass"/>
+  <test-case name="revalidate-valstrict-ins-001" result="pass"/>
+  <test-case name="revalidate-valstrict-ins-002" result="pass"/>
+  <test-case name="revalidate-valstrict-ins-003" result="pass"/>
+  <test-case name="revalidate-valstrict-ins-004" result="pass"/>
+  <test-case name="revalidate-valstrict-ins-005" result="pass"/>
+  <test-case name="revalidate-valstrict-ins-006" result="pass"/>
+  <test-case name="revalidate-valstrict-ins-007" result="pass"/>
+  <test-case name="revalidate-valstrict-ren-001" result="pass"/>
+  <test-case name="revalidate-valstrict-ren-002" result="pass"/>
+  <test-case name="revalidate-valstrict-ren-003" result="pass"/>
+  <test-case name="revalidate-valstrict-repnode-001" result="pass"/>
+  <test-case name="revalidate-valstrict-repnode-002" result="pass"/>
+  <test-case name="revalidate-valstrict-repnode-003" result="pass"/>
+  <test-case name="revalidate-valtrans-ins-001" result="pass"/>
+  <test-case name="revalidate-valtrans-ins-002" result="pass"/>
+  <test-case name="revalidate-valtrans-ins-003" result="not applicable" comment="This test was not run by Zorba: please consult the 'Guidelines for Running the XML Query Update Test Suite' for more details."/>
+  <test-case name="revalidation-declaration-01" result="pass"/>
+  <test-case name="revalidation-declaration-01-fail" result="not applicable" comment="This test was not run by Zorba: please consult the 'Guidelines for Running the XML Query Update Test Suite' for more details."/>
+  <test-case name="revalidation-declaration-02" result="pass"/>
+  <test-case name="revalidation-declaration-03" result="pass"/>
+  <test-case name="revalidation-declaration-03-fail" result="not applicable" comment="This test was not run by Zorba: please consult the 'Guidelines for Running the XML Query Update Test Suite' for more details."/>
+  <test-case name="revalidation-declaration-04" result="pass"/>
+  <test-case name="revalidation-declaration-05" result="pass"/>
+  <test-case name="revalidation-declaration-05-fail" result="not applicable" comment="This test was not run by Zorba: please consult the 'Guidelines for Running the XML Query Update Test Suite' for more details."/>
+  <test-case name="revalidation-declaration-06" result="pass"/>
+  <test-case name="setToUntyped-001" result="pass"/>
+  <test-case name="setToUntyped-002" result="pass"/>
+  <test-case name="setToUntyped-003" result="pass"/>
+  <test-case name="setToUntyped-004" result="pass"/>
+  <test-case name="setToUntyped-005" result="pass"/>
+  <test-case name="setToUntyped-006" result="pass"/>
+  <test-case name="setToUntyped-007" result="pass"/>
+  <test-case name="setToUntyped-008" result="pass"/>
+  <test-case name="setToUntyped-009" result="pass"/>
+  <test-case name="setToUntyped-010" result="pass"/>
+  <test-case name="soap-q1" result="pass"/>
+  <test-case name="statictyp-xqupd-01" result="pass"/>
+  <test-case name="statictyp-xqupd-02" result="pass"/>
+  <test-case name="statictyp-xqupd-03" result="pass"/>
+  <test-case name="statictyp-xqupd-04" result="pass"/>
+  <test-case name="statictyp-xqupd-05" result="pass"/>
+  <test-case name="statictyp-xqupd-06" result="pass"/>
+  <test-case name="statictyp-xqupd-07" result="pass"/>
+  <test-case name="statictyp-xqupd-08" result="pass"/>
+  <test-case name="statictyp-xqupd-09" result="pass"/>
+  <test-case name="statictyp-xqupd-10" result="pass"/>
+  <test-case name="statictyp-xqupd-11" result="pass"/>
+  <test-case name="statictyp-xqupd-12" result="pass"/>
+  <test-case name="statictyp-xqupd-13" result="pass"/>
+  <test-case name="statictyp-xqupd-14" result="pass"/>
+  <test-case name="statictyp-xqupd-15" result="pass"/>
+  <test-case name="statictyp-xqupd-16" result="pass"/>
+  <test-case name="statictyp-xqupd-17" result="pass"/>
+  <test-case name="statictyp-xqupd-18" result="pass"/>
+  <test-case name="statictyp-xqupd-19" result="pass"/>
+  <test-case name="statictyp-xqupd-20" result="pass"/>
+  <test-case name="statictyp-xqupd-21" result="pass"/>
+  <test-case name="statictyp-xqupd-22" result="pass"/>
+  <test-case name="statictyp-xqupd-23" result="pass"/>
+  <test-case name="statictyp-xqupd-24" result="pass"/>
+  <test-case name="statictyp-xqupd-25" result="pass"/>
+  <test-case name="statictyp-xqupd-26" result="pass"/>
+  <test-case name="statictyp-xqupd-27" result="pass"/>
+  <test-case name="statictyp-xqupd-28" result="pass"/>
+  <test-case name="statictyp-xqupd-29" result="pass"/>
+  <test-case name="statictyp-xqupd-30" result="pass"/>
+  <test-case name="statictyp-xqupd-31" result="pass"/>
+  <test-case name="statictyp-xqupd-32" result="pass"/>
+  <test-case name="statictyp-xqupd-33" result="pass"/>
+  <test-case name="statictyp-xqupd-34" result="pass"/>
+  <test-case name="statictyp-xqupd-35" result="pass"/>
+  <test-case name="statictyp-xqupd-36" result="pass"/>
+  <test-case name="statictyp-xqupd-37" result="pass"/>
+  <test-case name="statictyp-xqupd-38" result="pass"/>
+  <test-case name="statictyp-xqupd-39" result="pass"/>
+  <test-case name="statictyp-xqupd-40" result="pass"/>
+  <test-case name="statictyp-xqupd-41" result="pass"/>
+  <test-case name="statictyp-xqupd-42" result="pass"/>
+  <test-case name="statictyp-xqupd-43" result="pass"/>
+  <test-case name="statictyp-xqupd-44" result="pass"/>
+  <test-case name="statictyp-xqupd-45" result="pass"/>
+  <test-case name="statictyp-xqupd-46" result="pass"/>
+  <test-case name="statictyp-xqupd-47" result="pass"/>
+  <test-case name="statictyp-xqupd-48" result="pass"/>
+  <test-case name="statictyp-xqupd-49" result="pass"/>
+  <test-case name="statictyp-xqupd-50" result="pass"/>
+  <test-case name="statictyp-xqupd-51" result="pass"/>
+  <test-case name="statictyp-xqupd-52" result="pass"/>
+  <test-case name="statictyp-xqupd-53" result="pass"/>
+  <test-case name="statictyp-xqupd-54" result="pass"/>
+  <test-case name="statictyp-xqupd-55" result="pass"/>
+  <test-case name="statictyp-xqupd-56" result="pass"/>
+  <test-case name="statictyp-xqupd-57" result="pass"/>
+  <test-case name="statictyp-xqupd-58" result="pass"/>
+  <test-case name="statictyp-xqupd-59" result="pass"/>
+  <test-case name="statictyp-xqupd-60" result="pass"/>
+  <test-case name="stf-delete-01" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-delete-02" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-insert-01" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-insert-02" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-insert-after-01" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-insert-after-02" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-insert-after-03" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-insert-into-01" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-insert-into-02" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-insert-into-03" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-insert-into-04" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-rename-01" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-rename-02" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-rename-03" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-rename-04" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-replace-node-01" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-replace-node-02" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-replace-node-03" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-replace-node-04" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-replace-node-05" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-replace-node-06" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-replace-node-07" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-replace-value-of-node-01" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-replace-value-of-node-02" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-transform-01" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-transform-02" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-transform-03" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="update10keywords" result="pass"/>
+  <test-case name="variable-declaration-01" result="pass"/>
+  <test-case name="variable-declaration-02" result="pass"/>
+</test-suite-result>
 \ No newline at end of file
 
=== added file 'test/update/Scripts/zorba-xqutsx-submission.xml'
--- test/update/Scripts/zorba-xqutsx-submission.xml	1970-01-01 00:00:00 +0000
+++ test/update/Scripts/zorba-xqutsx-submission.xml	2012-01-26 09:42:31 +0000
@@ -0,0 +1,858 @@
+<test-suite-result xmlns="http://www.w3.org/2005/02/query-test-XQTSResult">
+  <implementation name="Zorba" version="2.1 'Basileia'" anonymous-result-column="false">
+    <organization name="FLWOR Foundation" website="http://zorba-xquery.com/" anonymous="false"/>
+    <submittor name="Zorba Team" email="[e-mail]"/>
+    <description>
+      <p>Zorba is a general purpose XQuery processor implementing in C++
+        the W3C family of specifications. It is not an XML database.
+        The query processor has been designed to be embeddable in a
+        variety of environments such as other programming languages
+        extended with XML processing capabilities, browsers,
+        database servers, XML message dispatchers, or smartphones.
+        Its architecture employes a modular design, which allows customizing
+        the Zorba query processor to the environment’s needs.
+        For more details please check out http://www.zorba-xquery.com.</p>
+    </description>
+    <implementation-defined-items>
+      <implementation-defined-item name="supportedRevalidationModes" value="lax, skip, strict"/>
+      <implementation-defined-item name="defaultRevalidationMode" value="lax"/>
+      <implementation-defined-item name="externalFunctionXDMPUL" value="Zorba allows external functions to be implemented in C++. Such functions may return XDM instances. However, it is not possible to implement an updating external function."/>
+      <implementation-defined-item name="fnPutSemantics" value="fn:put stores a copy (preserving type, preserving namespaces, and inheriting namespace) of the given document or element in Zorba's store. That is it binds the node to the URI passed as first argument. If the URI is relative it's resolved against the base uri. The result of fn:put become effective at the end of the XQuery program or if they are applied using Zorba's made persistent. Zorba does not implement fn:put() for attribute nodes."/>
+    </implementation-defined-items>
+    <features>
+      <feature name="Minimal Conformance" supported="true"/>
+      <feature name="Update Facility Static Typing Feature" supported="false"/>
+    </features>
+    <context-properties>
+      <context-property name="Revalidation mode" value="lax" context-type="static"/>
+    </context-properties>
+  </implementation>
+  <syntax>XQuery</syntax>
+  <test-run dateRun="2011-12-14">
+    <test-suite version="current"/>
+    <transformation>
+      <p>Standard</p>
+    </transformation>
+    <comparison>
+      <p>Standard</p>
+    </comparison>
+    <otherComments>
+      <p>XQUTS version taken from CVS as of 2011-12-09.</p>
+    </otherComments>
+  </test-run>
+  <test-case name="address-book-q1" result="pass"/>
+  <test-case name="applyUpdates-001" result="pass"/>
+  <test-case name="applyUpdates-002" result="pass"/>
+  <test-case name="applyUpdates-003" result="pass"/>
+  <test-case name="applyUpdates-004" result="pass"/>
+  <test-case name="applyUpdates-005" result="pass"/>
+  <test-case name="applyUpdates-006" result="pass"/>
+  <test-case name="applyUpdates-007" result="pass"/>
+  <test-case name="applyUpdates-008" result="pass"/>
+  <test-case name="applyUpdates-009" result="pass"/>
+  <test-case name="applyUpdates-010" result="pass"/>
+  <test-case name="applyUpdates-011" result="pass"/>
+  <test-case name="applyUpdates-012" result="pass"/>
+  <test-case name="applyUpdates-013" result="pass"/>
+  <test-case name="applyUpdates-014" result="pass"/>
+  <test-case name="applyUpdates-016" result="pass"/>
+  <test-case name="applyUpdates-021" result="pass"/>
+  <test-case name="applyUpdates-022" result="pass"/>
+  <test-case name="applyUpdates-023" result="pass"/>
+  <test-case name="applyUpdates-024" result="pass"/>
+  <test-case name="applyUpdates-025" result="pass"/>
+  <test-case name="applyUpdates-026" result="pass"/>
+  <test-case name="attribute-errors-q1" result="pass"/>
+  <test-case name="attribute-errors-q10" result="pass"/>
+  <test-case name="attribute-errors-q11" result="pass"/>
+  <test-case name="attribute-errors-q12" result="pass"/>
+  <test-case name="attribute-errors-q13" result="pass"/>
+  <test-case name="attribute-errors-q14" result="pass"/>
+  <test-case name="attribute-errors-q15" result="pass"/>
+  <test-case name="attribute-errors-q16" result="pass"/>
+  <test-case name="attribute-errors-q17" result="pass"/>
+  <test-case name="attribute-errors-q2" result="pass"/>
+  <test-case name="attribute-errors-q3" result="pass"/>
+  <test-case name="attribute-errors-q4" result="pass"/>
+  <test-case name="attribute-errors-q5" result="pass"/>
+  <test-case name="attribute-errors-q6" result="pass"/>
+  <test-case name="attribute-errors-q7" result="pass"/>
+  <test-case name="attribute-errors-q8" result="pass"/>
+  <test-case name="attribute-errors-q9" result="pass"/>
+  <test-case name="compatibility-001" result="pass"/>
+  <test-case name="compatibility-002" result="pass"/>
+  <test-case name="compatibility-003" result="pass"/>
+  <test-case name="compatibility-004" result="pass"/>
+  <test-case name="compatibility-005" result="pass"/>
+  <test-case name="compatibility-006" result="pass"/>
+  <test-case name="compatibility-007" result="pass"/>
+  <test-case name="compatibility-008" result="pass"/>
+  <test-case name="compatibility-009" result="pass"/>
+  <test-case name="compatibility-010" result="pass"/>
+  <test-case name="compatibility-011" result="pass"/>
+  <test-case name="compatibility-012" result="pass"/>
+  <test-case name="compatibility-013" result="pass"/>
+  <test-case name="compatibility-014" result="pass"/>
+  <test-case name="compatibility-015" result="pass"/>
+  <test-case name="compatibility-016" result="pass"/>
+  <test-case name="compatibility-017" result="pass"/>
+  <test-case name="compatibility-018" result="pass"/>
+  <test-case name="compatibility-019" result="pass"/>
+  <test-case name="compatibility-020" result="pass"/>
+  <test-case name="compatibility-021" result="pass"/>
+  <test-case name="compatibility-022" result="pass"/>
+  <test-case name="compatibility-023" result="pass"/>
+  <test-case name="compatibility-024" result="pass"/>
+  <test-case name="compatibility-025" result="pass"/>
+  <test-case name="compatibility-026" result="pass"/>
+  <test-case name="compatibility-027" result="pass"/>
+  <test-case name="compatibility-028" result="pass"/>
+  <test-case name="compatibility-029" result="pass"/>
+  <test-case name="compatibility-030" result="pass"/>
+  <test-case name="complex-deletes-q1" result="pass"/>
+  <test-case name="complex-deletes-q10" result="pass"/>
+  <test-case name="complex-deletes-q11" result="pass"/>
+  <test-case name="complex-deletes-q12" result="pass"/>
+  <test-case name="complex-deletes-q13" result="pass"/>
+  <test-case name="complex-deletes-q14" result="pass"/>
+  <test-case name="complex-deletes-q2" result="pass"/>
+  <test-case name="complex-deletes-q3" result="pass"/>
+  <test-case name="complex-deletes-q4" result="pass"/>
+  <test-case name="complex-deletes-q5" result="pass"/>
+  <test-case name="complex-deletes-q6" result="pass"/>
+  <test-case name="complex-deletes-q7" result="pass"/>
+  <test-case name="complex-deletes-q8" result="pass"/>
+  <test-case name="complex-deletes-q9" result="pass"/>
+  <test-case name="complex-renames-q1" result="pass"/>
+  <test-case name="complex-renames-q2" result="pass"/>
+  <test-case name="complex-renames-q3" result="pass"/>
+  <test-case name="complex-renames-q4" result="pass"/>
+  <test-case name="complex-renames-q5" result="pass"/>
+  <test-case name="complex-renames-q6" result="pass"/>
+  <test-case name="complex-renames-q7" result="pass"/>
+  <test-case name="complex-renames-q8" result="pass"/>
+  <test-case name="complex-replacevalues-q1" result="pass"/>
+  <test-case name="complex-replacevalues-q10" result="pass"/>
+  <test-case name="complex-replacevalues-q11" result="pass"/>
+  <test-case name="complex-replacevalues-q12" result="pass"/>
+  <test-case name="complex-replacevalues-q13" result="pass"/>
+  <test-case name="complex-replacevalues-q14" result="pass"/>
+  <test-case name="complex-replacevalues-q2" result="pass"/>
+  <test-case name="complex-replacevalues-q3" result="pass"/>
+  <test-case name="complex-replacevalues-q4" result="pass"/>
+  <test-case name="complex-replacevalues-q5" result="pass"/>
+  <test-case name="complex-replacevalues-q6" result="pass"/>
+  <test-case name="complex-replacevalues-q7" result="pass"/>
+  <test-case name="complex-replacevalues-q8" result="pass"/>
+  <test-case name="complex-replacevalues-q9" result="pass"/>
+  <test-case name="fn-put-001" result="pass"/>
+  <test-case name="fn-put-002" result="pass"/>
+  <test-case name="fn-put-003" result="pass"/>
+  <test-case name="fn-put-003-fail" result="not applicable" comment="This test was not run by Zorba: please consult the 'Guidelines for Running the XML Query Update Test Suite' for more details."/>
+  <test-case name="fn-put-004" result="pass"/>
+  <test-case name="fn-put-004-fail" result="not applicable" comment="This test was not run by Zorba: please consult the 'Guidelines for Running the XML Query Update Test Suite' for more details."/>
+  <test-case name="fn-put-005" result="not applicable" comment="Zorba does not support fn:put() for attibute nodes."/>
+  <test-case name="fn-put-005-fail" result="pass"/>
+  <test-case name="fn-put-006" result="pass"/>
+  <test-case name="fn-put-006-fail" result="not applicable" comment="This test was not run by Zorba: please consult the 'Guidelines for Running the XML Query Update Test Suite' for more details."/>
+  <test-case name="fn-put-007" result="pass"/>
+  <test-case name="fn-put-008" result="pass"/>
+  <test-case name="fn-put-009" result="pass"/>
+  <test-case name="fn-put-010" result="pass"/>
+  <test-case name="fn-put-011" result="pass"/>
+  <test-case name="fn-put-012" result="pass"/>
+  <test-case name="fn-put-013" result="pass"/>
+  <test-case name="fn-put-014" result="pass"/>
+  <test-case name="function-declaration-01" result="pass"/>
+  <test-case name="function-declaration-02" result="pass"/>
+  <test-case name="function-declaration-03" result="pass"/>
+  <test-case name="function-declaration-04" result="pass"/>
+  <test-case name="id-comma-expr-01" result="pass"/>
+  <test-case name="id-comma-expr-010" result="pass"/>
+  <test-case name="id-comma-expr-011" result="pass"/>
+  <test-case name="id-comma-expr-012" result="pass"/>
+  <test-case name="id-comma-expr-013" result="pass"/>
+  <test-case name="id-comma-expr-014" result="pass"/>
+  <test-case name="id-comma-expr-015" result="pass"/>
+  <test-case name="id-comma-expr-016" result="pass"/>
+  <test-case name="id-comma-expr-017" result="pass"/>
+  <test-case name="id-comma-expr-018" result="pass"/>
+  <test-case name="id-comma-expr-019" result="pass"/>
+  <test-case name="id-comma-expr-02" result="pass"/>
+  <test-case name="id-comma-expr-020" result="pass"/>
+  <test-case name="id-comma-expr-021" result="pass"/>
+  <test-case name="id-comma-expr-022" result="pass"/>
+  <test-case name="id-comma-expr-023" result="pass"/>
+  <test-case name="id-comma-expr-024" result="pass"/>
+  <test-case name="id-comma-expr-025" result="pass"/>
+  <test-case name="id-comma-expr-026" result="pass"/>
+  <test-case name="id-comma-expr-027" result="pass"/>
+  <test-case name="id-comma-expr-028" result="pass"/>
+  <test-case name="id-comma-expr-029" result="pass"/>
+  <test-case name="id-comma-expr-03" result="pass"/>
+  <test-case name="id-comma-expr-030" result="pass"/>
+  <test-case name="id-comma-expr-031" result="pass"/>
+  <test-case name="id-comma-expr-032" result="pass"/>
+  <test-case name="id-comma-expr-033" result="pass"/>
+  <test-case name="id-comma-expr-034" result="pass"/>
+  <test-case name="id-comma-expr-035" result="pass"/>
+  <test-case name="id-comma-expr-036" result="pass"/>
+  <test-case name="id-comma-expr-037" result="pass"/>
+  <test-case name="id-comma-expr-038" result="pass"/>
+  <test-case name="id-comma-expr-04" result="pass"/>
+  <test-case name="id-comma-expr-05" result="pass"/>
+  <test-case name="id-comma-expr-06" result="pass"/>
+  <test-case name="id-comma-expr-07" result="pass"/>
+  <test-case name="id-comma-expr-08" result="pass"/>
+  <test-case name="id-comma-expr-09" result="pass"/>
+  <test-case name="id-conditional-expr-01" result="pass"/>
+  <test-case name="id-conditional-expr-010" result="pass"/>
+  <test-case name="id-conditional-expr-011" result="pass"/>
+  <test-case name="id-conditional-expr-012" result="pass"/>
+  <test-case name="id-conditional-expr-013" result="pass"/>
+  <test-case name="id-conditional-expr-014" result="pass"/>
+  <test-case name="id-conditional-expr-015" result="pass"/>
+  <test-case name="id-conditional-expr-016" result="pass"/>
+  <test-case name="id-conditional-expr-017" result="pass"/>
+  <test-case name="id-conditional-expr-018" result="pass"/>
+  <test-case name="id-conditional-expr-019" result="pass"/>
+  <test-case name="id-conditional-expr-02" result="pass"/>
+  <test-case name="id-conditional-expr-020" result="pass"/>
+  <test-case name="id-conditional-expr-021" result="pass"/>
+  <test-case name="id-conditional-expr-022" result="pass"/>
+  <test-case name="id-conditional-expr-023" result="pass"/>
+  <test-case name="id-conditional-expr-024" result="pass"/>
+  <test-case name="id-conditional-expr-025" result="pass"/>
+  <test-case name="id-conditional-expr-026" result="pass"/>
+  <test-case name="id-conditional-expr-027" result="pass"/>
+  <test-case name="id-conditional-expr-028" result="pass"/>
+  <test-case name="id-conditional-expr-029" result="pass"/>
+  <test-case name="id-conditional-expr-03" result="pass"/>
+  <test-case name="id-conditional-expr-030" result="pass"/>
+  <test-case name="id-conditional-expr-031" result="pass"/>
+  <test-case name="id-conditional-expr-032" result="pass"/>
+  <test-case name="id-conditional-expr-033" result="pass"/>
+  <test-case name="id-conditional-expr-034" result="pass"/>
+  <test-case name="id-conditional-expr-035" result="pass"/>
+  <test-case name="id-conditional-expr-036" result="pass"/>
+  <test-case name="id-conditional-expr-037" result="pass"/>
+  <test-case name="id-conditional-expr-038" result="pass"/>
+  <test-case name="id-conditional-expr-04" result="pass"/>
+  <test-case name="id-conditional-expr-05" result="pass"/>
+  <test-case name="id-conditional-expr-06" result="pass"/>
+  <test-case name="id-conditional-expr-07" result="pass"/>
+  <test-case name="id-conditional-expr-08" result="pass"/>
+  <test-case name="id-conditional-expr-09" result="pass"/>
+  <test-case name="id-delete-expr-01" result="pass"/>
+  <test-case name="id-delete-expr-010" result="pass"/>
+  <test-case name="id-delete-expr-011" result="pass"/>
+  <test-case name="id-delete-expr-012" result="pass"/>
+  <test-case name="id-delete-expr-013" result="pass"/>
+  <test-case name="id-delete-expr-014" result="pass"/>
+  <test-case name="id-delete-expr-015" result="pass"/>
+  <test-case name="id-delete-expr-016" result="pass"/>
+  <test-case name="id-delete-expr-017" result="pass"/>
+  <test-case name="id-delete-expr-018" result="pass"/>
+  <test-case name="id-delete-expr-019" result="pass"/>
+  <test-case name="id-delete-expr-02" result="pass"/>
+  <test-case name="id-delete-expr-020" result="pass"/>
+  <test-case name="id-delete-expr-021" result="pass"/>
+  <test-case name="id-delete-expr-022" result="pass"/>
+  <test-case name="id-delete-expr-03" result="pass"/>
+  <test-case name="id-delete-expr-04" result="pass"/>
+  <test-case name="id-delete-expr-05" result="pass"/>
+  <test-case name="id-delete-expr-06" result="pass"/>
+  <test-case name="id-delete-expr-07" result="pass"/>
+  <test-case name="id-delete-expr-08" result="pass"/>
+  <test-case name="id-delete-expr-09" result="pass"/>
+  <test-case name="id-flwor-expr-01" result="pass"/>
+  <test-case name="id-flwor-expr-010" result="pass"/>
+  <test-case name="id-flwor-expr-011" result="pass"/>
+  <test-case name="id-flwor-expr-012" result="pass"/>
+  <test-case name="id-flwor-expr-013" result="pass"/>
+  <test-case name="id-flwor-expr-014" result="pass"/>
+  <test-case name="id-flwor-expr-015" result="pass"/>
+  <test-case name="id-flwor-expr-016" result="pass"/>
+  <test-case name="id-flwor-expr-017" result="pass"/>
+  <test-case name="id-flwor-expr-018" result="pass"/>
+  <test-case name="id-flwor-expr-019" result="pass"/>
+  <test-case name="id-flwor-expr-02" result="pass"/>
+  <test-case name="id-flwor-expr-020" result="pass"/>
+  <test-case name="id-flwor-expr-021" result="pass"/>
+  <test-case name="id-flwor-expr-022" result="pass"/>
+  <test-case name="id-flwor-expr-023" result="pass"/>
+  <test-case name="id-flwor-expr-024" result="pass"/>
+  <test-case name="id-flwor-expr-025" result="pass"/>
+  <test-case name="id-flwor-expr-03" result="pass"/>
+  <test-case name="id-flwor-expr-04" result="pass"/>
+  <test-case name="id-flwor-expr-05" result="pass"/>
+  <test-case name="id-flwor-expr-06" result="pass"/>
+  <test-case name="id-flwor-expr-07" result="pass"/>
+  <test-case name="id-flwor-expr-08" result="pass"/>
+  <test-case name="id-flwor-expr-09" result="pass"/>
+  <test-case name="id-function-call-01" result="pass"/>
+  <test-case name="id-function-call-02" result="pass"/>
+  <test-case name="id-function-call-03" result="pass"/>
+  <test-case name="id-function-call-04" result="pass"/>
+  <test-case name="id-function-call-05" result="pass"/>
+  <test-case name="id-function-call-06" result="pass"/>
+  <test-case name="id-function-declaration-01" result="pass"/>
+  <test-case name="id-function-declaration-010" result="pass"/>
+  <test-case name="id-function-declaration-011" result="pass"/>
+  <test-case name="id-function-declaration-012" result="pass"/>
+  <test-case name="id-function-declaration-013" result="pass"/>
+  <test-case name="id-function-declaration-014" result="pass"/>
+  <test-case name="id-function-declaration-015" result="pass"/>
+  <test-case name="id-function-declaration-016" result="pass"/>
+  <test-case name="id-function-declaration-017" result="pass"/>
+  <test-case name="id-function-declaration-02" result="pass"/>
+  <test-case name="id-function-declaration-03" result="pass"/>
+  <test-case name="id-function-declaration-04" result="pass"/>
+  <test-case name="id-function-declaration-05" result="pass"/>
+  <test-case name="id-function-declaration-06" result="pass"/>
+  <test-case name="id-function-declaration-07" result="pass"/>
+  <test-case name="id-function-declaration-08" result="pass"/>
+  <test-case name="id-function-declaration-09" result="pass"/>
+  <test-case name="id-insert-expr-01" result="pass"/>
+  <test-case name="id-insert-expr-010" result="pass"/>
+  <test-case name="id-insert-expr-011" result="pass"/>
+  <test-case name="id-insert-expr-012" result="pass"/>
+  <test-case name="id-insert-expr-013" result="pass"/>
+  <test-case name="id-insert-expr-014" result="pass"/>
+  <test-case name="id-insert-expr-015" result="pass"/>
+  <test-case name="id-insert-expr-016" result="pass"/>
+  <test-case name="id-insert-expr-017" result="pass"/>
+  <test-case name="id-insert-expr-018" result="pass"/>
+  <test-case name="id-insert-expr-019" result="pass"/>
+  <test-case name="id-insert-expr-02" result="pass"/>
+  <test-case name="id-insert-expr-020" result="pass"/>
+  <test-case name="id-insert-expr-021" result="pass"/>
+  <test-case name="id-insert-expr-022" result="pass"/>
+  <test-case name="id-insert-expr-023" result="pass"/>
+  <test-case name="id-insert-expr-024" result="pass"/>
+  <test-case name="id-insert-expr-025" result="pass"/>
+  <test-case name="id-insert-expr-026" result="pass"/>
+  <test-case name="id-insert-expr-027" result="pass"/>
+  <test-case name="id-insert-expr-028" result="pass"/>
+  <test-case name="id-insert-expr-029" result="pass"/>
+  <test-case name="id-insert-expr-03" result="pass"/>
+  <test-case name="id-insert-expr-030" result="pass"/>
+  <test-case name="id-insert-expr-031" result="pass"/>
+  <test-case name="id-insert-expr-032" result="pass"/>
+  <test-case name="id-insert-expr-033" result="pass"/>
+  <test-case name="id-insert-expr-034" result="pass"/>
+  <test-case name="id-insert-expr-035" result="pass"/>
+  <test-case name="id-insert-expr-036" result="pass"/>
+  <test-case name="id-insert-expr-037" result="pass"/>
+  <test-case name="id-insert-expr-038" result="pass"/>
+  <test-case name="id-insert-expr-039" result="pass"/>
+  <test-case name="id-insert-expr-04" result="pass"/>
+  <test-case name="id-insert-expr-040" result="pass"/>
+  <test-case name="id-insert-expr-041" result="pass"/>
+  <test-case name="id-insert-expr-042" result="pass"/>
+  <test-case name="id-insert-expr-043" result="pass"/>
+  <test-case name="id-insert-expr-044" result="pass"/>
+  <test-case name="id-insert-expr-045" result="pass"/>
+  <test-case name="id-insert-expr-046" result="pass"/>
+  <test-case name="id-insert-expr-047" result="pass"/>
+  <test-case name="id-insert-expr-048" result="pass"/>
+  <test-case name="id-insert-expr-049" result="pass"/>
+  <test-case name="id-insert-expr-05" result="pass"/>
+  <test-case name="id-insert-expr-050" result="pass"/>
+  <test-case name="id-insert-expr-051" result="pass"/>
+  <test-case name="id-insert-expr-052" result="pass"/>
+  <test-case name="id-insert-expr-053" result="pass"/>
+  <test-case name="id-insert-expr-054" result="pass"/>
+  <test-case name="id-insert-expr-055" result="pass"/>
+  <test-case name="id-insert-expr-056" result="pass"/>
+  <test-case name="id-insert-expr-057" result="pass"/>
+  <test-case name="id-insert-expr-058" result="pass"/>
+  <test-case name="id-insert-expr-059" result="pass"/>
+  <test-case name="id-insert-expr-06" result="pass"/>
+  <test-case name="id-insert-expr-060" result="pass"/>
+  <test-case name="id-insert-expr-061" result="pass"/>
+  <test-case name="id-insert-expr-062" result="pass"/>
+  <test-case name="id-insert-expr-063" result="pass"/>
+  <test-case name="id-insert-expr-064" result="pass"/>
+  <test-case name="id-insert-expr-065" result="pass"/>
+  <test-case name="id-insert-expr-066" result="pass"/>
+  <test-case name="id-insert-expr-067" result="pass"/>
+  <test-case name="id-insert-expr-068" result="pass"/>
+  <test-case name="id-insert-expr-069" result="pass"/>
+  <test-case name="id-insert-expr-07" result="pass"/>
+  <test-case name="id-insert-expr-070" result="pass"/>
+  <test-case name="id-insert-expr-071" result="pass"/>
+  <test-case name="id-insert-expr-072" result="pass"/>
+  <test-case name="id-insert-expr-073" result="pass"/>
+  <test-case name="id-insert-expr-074" result="pass"/>
+  <test-case name="id-insert-expr-075" result="pass"/>
+  <test-case name="id-insert-expr-076" result="pass"/>
+  <test-case name="id-insert-expr-077" result="pass"/>
+  <test-case name="id-insert-expr-078" result="pass"/>
+  <test-case name="id-insert-expr-079" result="pass"/>
+  <test-case name="id-insert-expr-08" result="pass"/>
+  <test-case name="id-insert-expr-080" result="pass"/>
+  <test-case name="id-insert-expr-081" result="pass"/>
+  <test-case name="id-insert-expr-081-no-inherit" result="pass"/>
+  <test-case name="id-insert-expr-082" result="pass"/>
+  <test-case name="id-insert-expr-082-no-inherit" result="pass"/>
+  <test-case name="id-insert-expr-083" result="pass"/>
+  <test-case name="id-insert-expr-083-no-inherit" result="pass"/>
+  <test-case name="id-insert-expr-084" result="pass"/>
+  <test-case name="id-insert-expr-084-no-inherit" result="pass"/>
+  <test-case name="id-insert-expr-085" result="pass"/>
+  <test-case name="id-insert-expr-085-no-inherit" result="pass"/>
+  <test-case name="id-insert-expr-086" result="pass"/>
+  <test-case name="id-insert-expr-086-no-inherit" result="pass"/>
+  <test-case name="id-insert-expr-087" result="pass"/>
+  <test-case name="id-insert-expr-088" result="pass"/>
+  <test-case name="id-insert-expr-089" result="pass"/>
+  <test-case name="id-insert-expr-09" result="pass"/>
+  <test-case name="id-insert-expr-090" result="pass"/>
+  <test-case name="id-insert-expr-091" result="pass"/>
+  <test-case name="id-insert-expr-092" result="pass"/>
+  <test-case name="id-insert-expr-093" result="pass"/>
+  <test-case name="id-insert-expr-094" result="pass"/>
+  <test-case name="id-other-expr-01" result="pass"/>
+  <test-case name="id-other-expr-010" result="pass"/>
+  <test-case name="id-other-expr-011" result="pass"/>
+  <test-case name="id-other-expr-012" result="pass"/>
+  <test-case name="id-other-expr-013" result="pass"/>
+  <test-case name="id-other-expr-014" result="pass"/>
+  <test-case name="id-other-expr-015" result="pass"/>
+  <test-case name="id-other-expr-016" result="pass"/>
+  <test-case name="id-other-expr-017" result="pass"/>
+  <test-case name="id-other-expr-018" result="pass"/>
+  <test-case name="id-other-expr-019" result="pass"/>
+  <test-case name="id-other-expr-02" result="pass"/>
+  <test-case name="id-other-expr-020" result="pass"/>
+  <test-case name="id-other-expr-021" result="pass"/>
+  <test-case name="id-other-expr-022" result="pass"/>
+  <test-case name="id-other-expr-023" result="pass"/>
+  <test-case name="id-other-expr-024" result="pass"/>
+  <test-case name="id-other-expr-025" result="pass"/>
+  <test-case name="id-other-expr-027" result="pass"/>
+  <test-case name="id-other-expr-028" result="pass"/>
+  <test-case name="id-other-expr-029" result="pass"/>
+  <test-case name="id-other-expr-03" result="pass"/>
+  <test-case name="id-other-expr-030" result="pass"/>
+  <test-case name="id-other-expr-031" result="pass"/>
+  <test-case name="id-other-expr-032" result="pass"/>
+  <test-case name="id-other-expr-04" result="pass"/>
+  <test-case name="id-other-expr-05" result="pass"/>
+  <test-case name="id-other-expr-06" result="pass"/>
+  <test-case name="id-other-expr-07" result="pass"/>
+  <test-case name="id-other-expr-08" result="pass"/>
+  <test-case name="id-other-expr-09" result="pass"/>
+  <test-case name="id-other-expr-26" result="pass"/>
+  <test-case name="id-rename-expr-01" result="pass"/>
+  <test-case name="id-rename-expr-010" result="pass"/>
+  <test-case name="id-rename-expr-011" result="pass"/>
+  <test-case name="id-rename-expr-012" result="pass"/>
+  <test-case name="id-rename-expr-013" result="pass"/>
+  <test-case name="id-rename-expr-014" result="pass"/>
+  <test-case name="id-rename-expr-015" result="pass"/>
+  <test-case name="id-rename-expr-016" result="pass"/>
+  <test-case name="id-rename-expr-017" result="pass"/>
+  <test-case name="id-rename-expr-018" result="pass"/>
+  <test-case name="id-rename-expr-019" result="pass"/>
+  <test-case name="id-rename-expr-02" result="pass"/>
+  <test-case name="id-rename-expr-020" result="pass"/>
+  <test-case name="id-rename-expr-021" result="pass"/>
+  <test-case name="id-rename-expr-022" result="pass"/>
+  <test-case name="id-rename-expr-023" result="pass"/>
+  <test-case name="id-rename-expr-024" result="pass"/>
+  <test-case name="id-rename-expr-025" result="pass"/>
+  <test-case name="id-rename-expr-026" result="pass"/>
+  <test-case name="id-rename-expr-027" result="pass"/>
+  <test-case name="id-rename-expr-028" result="pass"/>
+  <test-case name="id-rename-expr-029" result="pass"/>
+  <test-case name="id-rename-expr-03" result="pass"/>
+  <test-case name="id-rename-expr-030" result="pass"/>
+  <test-case name="id-rename-expr-031" result="pass"/>
+  <test-case name="id-rename-expr-032" result="pass"/>
+  <test-case name="id-rename-expr-033" result="pass"/>
+  <test-case name="id-rename-expr-033-no-inherit" result="pass"/>
+  <test-case name="id-rename-expr-034" result="pass"/>
+  <test-case name="id-rename-expr-034-no-inherit" result="pass"/>
+  <test-case name="id-rename-expr-035" result="pass"/>
+  <test-case name="id-rename-expr-036" result="pass"/>
+  <test-case name="id-rename-expr-037" result="pass"/>
+  <test-case name="id-rename-expr-04" result="pass"/>
+  <test-case name="id-rename-expr-05" result="pass"/>
+  <test-case name="id-rename-expr-06" result="pass"/>
+  <test-case name="id-rename-expr-07" result="pass"/>
+  <test-case name="id-rename-expr-08" result="pass"/>
+  <test-case name="id-rename-expr-09" result="pass"/>
+  <test-case name="id-replace-expr-01" result="pass"/>
+  <test-case name="id-replace-expr-010" result="pass"/>
+  <test-case name="id-replace-expr-011" result="pass"/>
+  <test-case name="id-replace-expr-012" result="pass"/>
+  <test-case name="id-replace-expr-013" result="pass"/>
+  <test-case name="id-replace-expr-014" result="pass"/>
+  <test-case name="id-replace-expr-015" result="pass"/>
+  <test-case name="id-replace-expr-016" result="pass"/>
+  <test-case name="id-replace-expr-017" result="pass"/>
+  <test-case name="id-replace-expr-018" result="pass"/>
+  <test-case name="id-replace-expr-019" result="pass"/>
+  <test-case name="id-replace-expr-02" result="pass"/>
+  <test-case name="id-replace-expr-020" result="pass"/>
+  <test-case name="id-replace-expr-021" result="pass"/>
+  <test-case name="id-replace-expr-022" result="pass"/>
+  <test-case name="id-replace-expr-023" result="pass"/>
+  <test-case name="id-replace-expr-024" result="pass"/>
+  <test-case name="id-replace-expr-025" result="pass"/>
+  <test-case name="id-replace-expr-026" result="pass"/>
+  <test-case name="id-replace-expr-027" result="pass"/>
+  <test-case name="id-replace-expr-028" result="pass"/>
+  <test-case name="id-replace-expr-029" result="pass"/>
+  <test-case name="id-replace-expr-03" result="pass"/>
+  <test-case name="id-replace-expr-030" result="pass"/>
+  <test-case name="id-replace-expr-031" result="pass"/>
+  <test-case name="id-replace-expr-032" result="pass"/>
+  <test-case name="id-replace-expr-033" result="pass"/>
+  <test-case name="id-replace-expr-034" result="pass"/>
+  <test-case name="id-replace-expr-035" result="pass"/>
+  <test-case name="id-replace-expr-036" result="pass"/>
+  <test-case name="id-replace-expr-037" result="pass"/>
+  <test-case name="id-replace-expr-038" result="pass"/>
+  <test-case name="id-replace-expr-039" result="pass"/>
+  <test-case name="id-replace-expr-04" result="pass"/>
+  <test-case name="id-replace-expr-040" result="pass"/>
+  <test-case name="id-replace-expr-041" result="pass"/>
+  <test-case name="id-replace-expr-042" result="pass"/>
+  <test-case name="id-replace-expr-043" result="pass"/>
+  <test-case name="id-replace-expr-044" result="pass"/>
+  <test-case name="id-replace-expr-045" result="pass"/>
+  <test-case name="id-replace-expr-045-no-inherit" result="pass"/>
+  <test-case name="id-replace-expr-05" result="pass"/>
+  <test-case name="id-replace-expr-06" result="pass"/>
+  <test-case name="id-replace-expr-07" result="pass"/>
+  <test-case name="id-replace-expr-08" result="pass"/>
+  <test-case name="id-replace-expr-09" result="pass"/>
+  <test-case name="id-transform-expr-01" result="pass"/>
+  <test-case name="id-transform-expr-010" result="pass"/>
+  <test-case name="id-transform-expr-011" result="pass"/>
+  <test-case name="id-transform-expr-012" result="pass"/>
+  <test-case name="id-transform-expr-013" result="pass"/>
+  <test-case name="id-transform-expr-014" result="pass"/>
+  <test-case name="id-transform-expr-015" result="pass"/>
+  <test-case name="id-transform-expr-016" result="pass"/>
+  <test-case name="id-transform-expr-017" result="pass"/>
+  <test-case name="id-transform-expr-018" result="pass"/>
+  <test-case name="id-transform-expr-019" result="pass"/>
+  <test-case name="id-transform-expr-02" result="pass"/>
+  <test-case name="id-transform-expr-020" result="pass"/>
+  <test-case name="id-transform-expr-021" result="pass"/>
+  <test-case name="id-transform-expr-022" result="pass"/>
+  <test-case name="id-transform-expr-023" result="pass"/>
+  <test-case name="id-transform-expr-024" result="pass"/>
+  <test-case name="id-transform-expr-025" result="pass"/>
+  <test-case name="id-transform-expr-026" result="pass"/>
+  <test-case name="id-transform-expr-027" result="pass"/>
+  <test-case name="id-transform-expr-028" result="pass"/>
+  <test-case name="id-transform-expr-029" result="pass"/>
+  <test-case name="id-transform-expr-03" result="pass"/>
+  <test-case name="id-transform-expr-030" result="pass"/>
+  <test-case name="id-transform-expr-031" result="pass"/>
+  <test-case name="id-transform-expr-032" result="pass"/>
+  <test-case name="id-transform-expr-033" result="pass"/>
+  <test-case name="id-transform-expr-034" result="pass"/>
+  <test-case name="id-transform-expr-035" result="pass"/>
+  <test-case name="id-transform-expr-036" result="pass"/>
+  <test-case name="id-transform-expr-037" result="pass"/>
+  <test-case name="id-transform-expr-038" result="pass"/>
+  <test-case name="id-transform-expr-039" result="pass"/>
+  <test-case name="id-transform-expr-04" result="pass"/>
+  <test-case name="id-transform-expr-040" result="pass"/>
+  <test-case name="id-transform-expr-041" result="pass"/>
+  <test-case name="id-transform-expr-042" result="pass"/>
+  <test-case name="id-transform-expr-043" result="pass"/>
+  <test-case name="id-transform-expr-044" result="pass"/>
+  <test-case name="id-transform-expr-045" result="pass"/>
+  <test-case name="id-transform-expr-046" result="pass"/>
+  <test-case name="id-transform-expr-047" result="pass"/>
+  <test-case name="id-transform-expr-048" result="pass"/>
+  <test-case name="id-transform-expr-049" result="pass"/>
+  <test-case name="id-transform-expr-05" result="pass"/>
+  <test-case name="id-transform-expr-050" result="pass"/>
+  <test-case name="id-transform-expr-051" result="pass"/>
+  <test-case name="id-transform-expr-052" result="pass"/>
+  <test-case name="id-transform-expr-053" result="pass"/>
+  <test-case name="id-transform-expr-054" result="pass"/>
+  <test-case name="id-transform-expr-055" result="pass"/>
+  <test-case name="id-transform-expr-056" result="pass"/>
+  <test-case name="id-transform-expr-057" result="pass"/>
+  <test-case name="id-transform-expr-058" result="pass"/>
+  <test-case name="id-transform-expr-06" result="pass"/>
+  <test-case name="id-transform-expr-07" result="pass"/>
+  <test-case name="id-transform-expr-08" result="pass"/>
+  <test-case name="id-transform-expr-09" result="pass"/>
+  <test-case name="id-typeswitch-expr-01" result="pass"/>
+  <test-case name="id-typeswitch-expr-010" result="pass"/>
+  <test-case name="id-typeswitch-expr-011" result="pass"/>
+  <test-case name="id-typeswitch-expr-012" result="pass"/>
+  <test-case name="id-typeswitch-expr-013" result="pass"/>
+  <test-case name="id-typeswitch-expr-014" result="pass"/>
+  <test-case name="id-typeswitch-expr-015" result="pass"/>
+  <test-case name="id-typeswitch-expr-016" result="pass"/>
+  <test-case name="id-typeswitch-expr-017" result="pass"/>
+  <test-case name="id-typeswitch-expr-018" result="pass"/>
+  <test-case name="id-typeswitch-expr-019" result="pass"/>
+  <test-case name="id-typeswitch-expr-02" result="pass"/>
+  <test-case name="id-typeswitch-expr-020" result="pass"/>
+  <test-case name="id-typeswitch-expr-021" result="pass"/>
+  <test-case name="id-typeswitch-expr-022" result="pass"/>
+  <test-case name="id-typeswitch-expr-023" result="pass"/>
+  <test-case name="id-typeswitch-expr-024" result="pass"/>
+  <test-case name="id-typeswitch-expr-025" result="pass"/>
+  <test-case name="id-typeswitch-expr-026" result="pass"/>
+  <test-case name="id-typeswitch-expr-027" result="pass"/>
+  <test-case name="id-typeswitch-expr-028" result="pass"/>
+  <test-case name="id-typeswitch-expr-029" result="pass"/>
+  <test-case name="id-typeswitch-expr-03" result="pass"/>
+  <test-case name="id-typeswitch-expr-030" result="pass"/>
+  <test-case name="id-typeswitch-expr-031" result="pass"/>
+  <test-case name="id-typeswitch-expr-032" result="pass"/>
+  <test-case name="id-typeswitch-expr-033" result="pass"/>
+  <test-case name="id-typeswitch-expr-034" result="pass"/>
+  <test-case name="id-typeswitch-expr-035" result="pass"/>
+  <test-case name="id-typeswitch-expr-036" result="pass"/>
+  <test-case name="id-typeswitch-expr-037" result="pass"/>
+  <test-case name="id-typeswitch-expr-038" result="pass"/>
+  <test-case name="id-typeswitch-expr-04" result="pass"/>
+  <test-case name="id-typeswitch-expr-05" result="pass"/>
+  <test-case name="id-typeswitch-expr-06" result="pass"/>
+  <test-case name="id-typeswitch-expr-07" result="pass"/>
+  <test-case name="id-typeswitch-expr-08" result="pass"/>
+  <test-case name="id-typeswitch-expr-09" result="pass"/>
+  <test-case name="mergeUpdates-001" result="pass"/>
+  <test-case name="mergeUpdates-002" result="pass"/>
+  <test-case name="namespace-errors-q1" result="pass"/>
+  <test-case name="namespace-errors-q10" result="pass"/>
+  <test-case name="namespace-errors-q11" result="pass"/>
+  <test-case name="namespace-errors-q12" result="pass"/>
+  <test-case name="namespace-errors-q13" result="pass"/>
+  <test-case name="namespace-errors-q14" result="pass"/>
+  <test-case name="namespace-errors-q15" result="pass"/>
+  <test-case name="namespace-errors-q16" result="pass"/>
+  <test-case name="namespace-errors-q17" result="pass"/>
+  <test-case name="namespace-errors-q18" result="pass"/>
+  <test-case name="namespace-errors-q19" result="pass"/>
+  <test-case name="namespace-errors-q2" result="pass"/>
+  <test-case name="namespace-errors-q3" result="pass"/>
+  <test-case name="namespace-errors-q4" result="pass"/>
+  <test-case name="namespace-errors-q5" result="pass"/>
+  <test-case name="namespace-errors-q6" result="pass"/>
+  <test-case name="namespace-errors-q7" result="pass"/>
+  <test-case name="namespace-errors-q8" result="pass"/>
+  <test-case name="namespace-errors-q9" result="pass"/>
+  <test-case name="namespaces-q1" result="pass"/>
+  <test-case name="nil-q1" result="pass"/>
+  <test-case name="parenthesized-expr-01" result="pass"/>
+  <test-case name="parenthesized-expr-02" result="pass"/>
+  <test-case name="parenthesized-expr-03" result="pass"/>
+  <test-case name="parts-q1" result="pass"/>
+  <test-case name="parts-q2" result="pass"/>
+  <test-case name="parts-q3-1" result="pass"/>
+  <test-case name="parts-q3-2" result="pass"/>
+  <test-case name="parts-q4-1" result="pass"/>
+  <test-case name="parts-q4-2" result="pass"/>
+  <test-case name="parts-q6" result="pass"/>
+  <test-case name="propagateNamespaces01" result="pass"/>
+  <test-case name="propagateNamespaces02" result="pass"/>
+  <test-case name="propagateNamespaces03" result="pass"/>
+  <test-case name="propagateNamespaces04" result="pass"/>
+  <test-case name="propagateNamespaces05" result="pass"/>
+  <test-case name="propagateNamespaces06" result="pass"/>
+  <test-case name="put-001" result="pass"/>
+  <test-case name="relational-data-q1" result="pass"/>
+  <test-case name="relational-data-q2" result="pass"/>
+  <test-case name="relational-data-q3" result="pass"/>
+  <test-case name="relational-data-q4" result="pass"/>
+  <test-case name="relational-data-q5-1" result="pass"/>
+  <test-case name="relational-data-q5-2" result="pass"/>
+  <test-case name="relational-data-q6-1" result="pass"/>
+  <test-case name="relational-data-q6-2" result="pass"/>
+  <test-case name="relational-data-q7" result="pass"/>
+  <test-case name="relational-data-q8" result="pass"/>
+  <test-case name="relational-data-q9" result="pass"/>
+  <test-case name="removeType-valskip-del-001" result="pass"/>
+  <test-case name="removeType-valskip-del-002" result="pass"/>
+  <test-case name="removeType-valskip-del-003" result="pass"/>
+  <test-case name="removeType-valskip-del-004" result="pass"/>
+  <test-case name="removeType-valskip-del-005" result="pass"/>
+  <test-case name="removeType-valskip-ins-001" result="pass"/>
+  <test-case name="removeType-valskip-ins-002" result="pass"/>
+  <test-case name="removeType-valskip-ins-003" result="pass"/>
+  <test-case name="removeType-valskip-ins-004" result="pass"/>
+  <test-case name="removeType-valskip-ins-005" result="pass"/>
+  <test-case name="removeType-valskip-ins-006" result="pass"/>
+  <test-case name="removeType-valskip-ins-007" result="pass"/>
+  <test-case name="removeType-valskip-ins-008" result="pass"/>
+  <test-case name="removeType-valskip-ins-009" result="pass"/>
+  <test-case name="removeType-valskip-ins-010" result="pass"/>
+  <test-case name="removeType-valskip-ins-011" result="pass"/>
+  <test-case name="removeType-valskip-ins-012" result="pass"/>
+  <test-case name="removeType-valskip-ins-013" result="pass"/>
+  <test-case name="removeType-valskip-ins-014" result="pass"/>
+  <test-case name="removeType-valskip-ren-001" result="pass"/>
+  <test-case name="removeType-valskip-ren-002" result="pass"/>
+  <test-case name="removeType-valskip-ren-003" result="pass"/>
+  <test-case name="removeType-valskip-ren-004" result="pass"/>
+  <test-case name="removeType-valskip-ren-005" result="pass"/>
+  <test-case name="removeType-valskip-ren-006" result="pass"/>
+  <test-case name="removeType-valskip-repnode-001" result="pass"/>
+  <test-case name="removeType-valskip-repnode-002" result="pass"/>
+  <test-case name="removeType-valskip-repnode-003" result="pass"/>
+  <test-case name="removeType-valskip-repnode-004" result="pass"/>
+  <test-case name="removeType-valskip-repnode-005" result="pass"/>
+  <test-case name="removeType-valskip-repnode-006" result="pass"/>
+  <test-case name="revalidate-vallax-del-001" result="pass"/>
+  <test-case name="revalidate-vallax-del-002" result="pass"/>
+  <test-case name="revalidate-vallax-del-003" result="pass"/>
+  <test-case name="revalidate-vallax-del-004" result="pass"/>
+  <test-case name="revalidate-vallax-ins-001" result="pass"/>
+  <test-case name="revalidate-vallax-ins-002" result="pass"/>
+  <test-case name="revalidate-vallax-ins-003" result="pass"/>
+  <test-case name="revalidate-vallax-ins-004" result="pass"/>
+  <test-case name="revalidate-vallax-ins-005" result="pass"/>
+  <test-case name="revalidate-vallax-ins-006" result="pass"/>
+  <test-case name="revalidate-vallax-ins-007" result="pass"/>
+  <test-case name="revalidate-vallax-ren-001" result="pass"/>
+  <test-case name="revalidate-vallax-ren-002" result="pass"/>
+  <test-case name="revalidate-vallax-ren-003" result="pass"/>
+  <test-case name="revalidate-vallax-repnode-001" result="pass"/>
+  <test-case name="revalidate-vallax-repnode-002" result="pass"/>
+  <test-case name="revalidate-vallax-repnode-003" result="pass"/>
+  <test-case name="revalidate-valstrict-del-001" result="pass"/>
+  <test-case name="revalidate-valstrict-del-002" result="pass"/>
+  <test-case name="revalidate-valstrict-del-003" result="pass"/>
+  <test-case name="revalidate-valstrict-del-004" result="pass"/>
+  <test-case name="revalidate-valstrict-ins-001" result="pass"/>
+  <test-case name="revalidate-valstrict-ins-002" result="pass"/>
+  <test-case name="revalidate-valstrict-ins-003" result="pass"/>
+  <test-case name="revalidate-valstrict-ins-004" result="pass"/>
+  <test-case name="revalidate-valstrict-ins-005" result="pass"/>
+  <test-case name="revalidate-valstrict-ins-006" result="pass"/>
+  <test-case name="revalidate-valstrict-ins-007" result="pass"/>
+  <test-case name="revalidate-valstrict-ren-001" result="pass"/>
+  <test-case name="revalidate-valstrict-ren-002" result="pass"/>
+  <test-case name="revalidate-valstrict-ren-003" result="pass"/>
+  <test-case name="revalidate-valstrict-repnode-001" result="pass"/>
+  <test-case name="revalidate-valstrict-repnode-002" result="pass"/>
+  <test-case name="revalidate-valstrict-repnode-003" result="pass"/>
+  <test-case name="revalidate-valtrans-ins-001" result="pass"/>
+  <test-case name="revalidate-valtrans-ins-002" result="pass"/>
+  <test-case name="revalidate-valtrans-ins-003" result="not applicable" comment="This test was not run by Zorba: please consult the 'Guidelines for Running the XML Query Update Test Suite' for more details."/>
+  <test-case name="revalidation-declaration-01" result="pass"/>
+  <test-case name="revalidation-declaration-01-fail" result="not applicable" comment="This test was not run by Zorba: please consult the 'Guidelines for Running the XML Query Update Test Suite' for more details."/>
+  <test-case name="revalidation-declaration-02" result="pass"/>
+  <test-case name="revalidation-declaration-03" result="pass"/>
+  <test-case name="revalidation-declaration-03-fail" result="not applicable" comment="This test was not run by Zorba: please consult the 'Guidelines for Running the XML Query Update Test Suite' for more details."/>
+  <test-case name="revalidation-declaration-04" result="pass"/>
+  <test-case name="revalidation-declaration-05" result="pass"/>
+  <test-case name="revalidation-declaration-05-fail" result="not applicable" comment="This test was not run by Zorba: please consult the 'Guidelines for Running the XML Query Update Test Suite' for more details."/>
+  <test-case name="revalidation-declaration-06" result="pass"/>
+  <test-case name="setToUntyped-001" result="pass"/>
+  <test-case name="setToUntyped-002" result="pass"/>
+  <test-case name="setToUntyped-003" result="pass"/>
+  <test-case name="setToUntyped-004" result="pass"/>
+  <test-case name="setToUntyped-005" result="pass"/>
+  <test-case name="setToUntyped-006" result="pass"/>
+  <test-case name="setToUntyped-007" result="pass"/>
+  <test-case name="setToUntyped-008" result="pass"/>
+  <test-case name="setToUntyped-009" result="pass"/>
+  <test-case name="setToUntyped-010" result="pass"/>
+  <test-case name="soap-q1" result="pass"/>
+  <test-case name="statictyp-xqupd-01" result="pass"/>
+  <test-case name="statictyp-xqupd-02" result="pass"/>
+  <test-case name="statictyp-xqupd-03" result="pass"/>
+  <test-case name="statictyp-xqupd-04" result="pass"/>
+  <test-case name="statictyp-xqupd-05" result="pass"/>
+  <test-case name="statictyp-xqupd-06" result="pass"/>
+  <test-case name="statictyp-xqupd-07" result="pass"/>
+  <test-case name="statictyp-xqupd-08" result="pass"/>
+  <test-case name="statictyp-xqupd-09" result="pass"/>
+  <test-case name="statictyp-xqupd-10" result="pass"/>
+  <test-case name="statictyp-xqupd-11" result="pass"/>
+  <test-case name="statictyp-xqupd-12" result="pass"/>
+  <test-case name="statictyp-xqupd-13" result="pass"/>
+  <test-case name="statictyp-xqupd-14" result="pass"/>
+  <test-case name="statictyp-xqupd-15" result="pass"/>
+  <test-case name="statictyp-xqupd-16" result="pass"/>
+  <test-case name="statictyp-xqupd-17" result="pass"/>
+  <test-case name="statictyp-xqupd-18" result="pass"/>
+  <test-case name="statictyp-xqupd-19" result="pass"/>
+  <test-case name="statictyp-xqupd-20" result="pass"/>
+  <test-case name="statictyp-xqupd-21" result="pass"/>
+  <test-case name="statictyp-xqupd-22" result="pass"/>
+  <test-case name="statictyp-xqupd-23" result="pass"/>
+  <test-case name="statictyp-xqupd-24" result="pass"/>
+  <test-case name="statictyp-xqupd-25" result="pass"/>
+  <test-case name="statictyp-xqupd-26" result="pass"/>
+  <test-case name="statictyp-xqupd-27" result="pass"/>
+  <test-case name="statictyp-xqupd-28" result="pass"/>
+  <test-case name="statictyp-xqupd-29" result="pass"/>
+  <test-case name="statictyp-xqupd-30" result="pass"/>
+  <test-case name="statictyp-xqupd-31" result="pass"/>
+  <test-case name="statictyp-xqupd-32" result="pass"/>
+  <test-case name="statictyp-xqupd-33" result="pass"/>
+  <test-case name="statictyp-xqupd-34" result="pass"/>
+  <test-case name="statictyp-xqupd-35" result="pass"/>
+  <test-case name="statictyp-xqupd-36" result="pass"/>
+  <test-case name="statictyp-xqupd-37" result="pass"/>
+  <test-case name="statictyp-xqupd-38" result="pass"/>
+  <test-case name="statictyp-xqupd-39" result="pass"/>
+  <test-case name="statictyp-xqupd-40" result="pass"/>
+  <test-case name="statictyp-xqupd-41" result="pass"/>
+  <test-case name="statictyp-xqupd-42" result="pass"/>
+  <test-case name="statictyp-xqupd-43" result="pass"/>
+  <test-case name="statictyp-xqupd-44" result="pass"/>
+  <test-case name="statictyp-xqupd-45" result="pass"/>
+  <test-case name="statictyp-xqupd-46" result="pass"/>
+  <test-case name="statictyp-xqupd-47" result="pass"/>
+  <test-case name="statictyp-xqupd-48" result="pass"/>
+  <test-case name="statictyp-xqupd-49" result="pass"/>
+  <test-case name="statictyp-xqupd-50" result="pass"/>
+  <test-case name="statictyp-xqupd-51" result="pass"/>
+  <test-case name="statictyp-xqupd-52" result="pass"/>
+  <test-case name="statictyp-xqupd-53" result="pass"/>
+  <test-case name="statictyp-xqupd-54" result="pass"/>
+  <test-case name="statictyp-xqupd-55" result="pass"/>
+  <test-case name="statictyp-xqupd-56" result="pass"/>
+  <test-case name="statictyp-xqupd-57" result="pass"/>
+  <test-case name="statictyp-xqupd-58" result="pass"/>
+  <test-case name="statictyp-xqupd-59" result="pass"/>
+  <test-case name="statictyp-xqupd-60" result="pass"/>
+  <test-case name="stf-delete-01" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-delete-02" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-insert-01" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-insert-02" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-insert-after-01" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-insert-after-02" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-insert-after-03" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-insert-into-01" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-insert-into-02" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-insert-into-03" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-insert-into-04" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-rename-01" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-rename-02" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-rename-03" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-rename-04" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-replace-node-01" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-replace-node-02" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-replace-node-03" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-replace-node-04" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-replace-node-05" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-replace-node-06" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-replace-node-07" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-replace-value-of-node-01" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-replace-value-of-node-02" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-transform-01" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-transform-02" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="stf-transform-03" result="not applicable" comment="Zorba does not support the 'Update Facility Static Typing Feature'"/>
+  <test-case name="update10keywords" result="pass"/>
+  <test-case name="variable-declaration-01" result="pass"/>
+  <test-case name="variable-declaration-02" result="pass"/>
+</test-suite-result>
 \ No newline at end of file