You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by pr...@apache.org on 2016/03/04 20:10:26 UTC

[1/4] vxquery git commit: Updated the XQTS stored results.

Repository: vxquery
Updated Branches:
  refs/heads/master d7c32f874 -> 43852a547


http://git-wip-us.apache.org/repos/asf/vxquery/blob/bf8ab735/vxquery-xtest/results/xqts.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/results/xqts.txt b/vxquery-xtest/results/xqts.txt
index 8054c36..0431f9a 100644
--- a/vxquery-xtest/results/xqts.txt
+++ b/vxquery-xtest/results/xqts.txt
@@ -50,13 +50,13 @@ Basics/Types/SequenceTypeSyntax//sequence-type-6, EXPECTED_RESULT_GOT_SAME_RESUL
 Basics/Types/SequenceTypeSyntax//sequence-type-7, EXPECTED_RESULT_GOT_SAME_RESULT
 Basics/Types/SequenceTypeSyntax//sequence-type-8, EXPECTED_RESULT_GOT_SAME_RESULT
 Basics/Types/SequenceTypeSyntax//sequence-type-9, EXPECTED_RESULT_GOT_SAME_RESULT
-Catalog//Catalog001, EXPECTED_RESULT_GOT_FAILURE
+Catalog//Catalog001, EXPECTED_RESULT_GOT_ERROR
 Catalog//Catalog002, EXPECTED_RESULT_GOT_FAILURE
 Catalog//Catalog003, EXPECTED_RESULT_GOT_FAILURE
 CondExpr//K2-CondExpr-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 CondExpr//K2-CondExpr-2, EXPECTED_RESULT_GOT_ERROR
 CondExpr//K2-CondExpr-3, EXPECTED_RESULT_GOT_ERROR
-CondExpr//K2-CondExpr-4, EXPECTED_RESULT_GOT_FAILURE
+CondExpr//K2-CondExpr-4, EXPECTED_RESULT_GOT_ERROR
 CondExpr//K2-CondExpr-5, EXPECTED_ERROR_GOT_SAME_ERROR
 CondExpr//K2-CondExpr-6, EXPECTED_ERROR_GOT_SAME_ERROR
 CondExpr//K2-CondExpr-7, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -102,7 +102,7 @@ Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-44, EXPECTED_ERROR_GOT_RE
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-45, EXPECTED_ERROR_GOT_RESULT
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-46, EXPECTED_ERROR_GOT_RESULT
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-47, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-48, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-48, EXPECTED_ERROR_GOT_RESULT
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-49, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-5, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-50, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -163,8 +163,8 @@ Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-4, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-5, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-6, EXPECTED_ERROR_GOT_RESULT
 Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-7, EXPECTED_ERROR_GOT_RESULT
-Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-8, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-9, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-8, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-9, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-1, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-10, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-11, EXPECTED_RESULT_GOT_ERROR
@@ -175,20 +175,20 @@ Construct/ComputeCon/ConDocNode//K2-ConDocNode-15, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-16, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-17, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-18, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-19, EXPECTED_RESULT_GOT_FAILURE
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-19, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-20, EXPECTED_RESULT_GOT_FAILURE
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-21, EXPECTED_RESULT_GOT_FAILURE
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-22, EXPECTED_RESULT_GOT_FAILURE
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-20, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-21, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-22, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-23, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-24, EXPECTED_RESULT_GOT_FAILURE
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-25, EXPECTED_RESULT_GOT_FAILURE
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-24, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-25, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-26, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-27, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-28, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-29, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-30, EXPECTED_RESULT_GOT_FAILURE
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-30, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-31, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-32, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -203,9 +203,9 @@ Construct/ComputeCon/ConText//K2-ConText-11, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/ComputeCon/ConText//K2-ConText-12, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/ComputeCon/ConText//K2-ConText-13, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/ComputeCon/ConText//K2-ConText-14, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/ComputeCon/ConText//K2-ConText-15, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ConText//K2-ConText-15, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/ComputeCon/ConText//K2-ConText-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ConText//K2-ConText-3, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ConText//K2-ConText-3, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/ComputeCon/ConText//K2-ConText-4, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConText//K2-ConText-5, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/ComputeCon/ConText//K2-ConText-6, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -213,7 +213,7 @@ Construct/ComputeCon/ConText//K2-ConText-7, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/ComputeCon/ConText//K2-ConText-8, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/ComputeCon/ConText//K2-ConText-9, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/ConInScopeNamespace//K2-ConInScopeNamespace-1, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem//K2-DirectConElem-1, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem//K2-DirectConElem-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem//K2-DirectConElem-10, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/DirectConElem//K2-DirectConElem-11, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem//K2-DirectConElem-12, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -224,7 +224,7 @@ Construct/DirectConElem//K2-DirectConElem-16, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem//K2-DirectConElem-17, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem//K2-DirectConElem-18, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem//K2-DirectConElem-19, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-2, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem//K2-DirectConElem-2, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem//K2-DirectConElem-20, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem//K2-DirectConElem-21, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem//K2-DirectConElem-22, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -251,10 +251,10 @@ Construct/DirectConElem//K2-DirectConElem-40, EXPECTED_ERROR_GOT_RESULT
 Construct/DirectConElem//K2-DirectConElem-41, EXPECTED_ERROR_GOT_RESULT
 Construct/DirectConElem//K2-DirectConElem-42, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem//K2-DirectConElem-43, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem//K2-DirectConElem-44, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem//K2-DirectConElem-44, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem//K2-DirectConElem-45, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem//K2-DirectConElem-46, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem//K2-DirectConElem-47, EXPECTED_ERROR_GOT_FAILURE
+Construct/DirectConElem//K2-DirectConElem-47, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/DirectConElem//K2-DirectConElem-48, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem//K2-DirectConElem-49, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem//K2-DirectConElem-5, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -290,18 +290,18 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-25, EXPECTED_ERR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-26, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-27, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-28, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-29, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-29, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-30, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-31, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-32, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-30, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-31, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-32, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-33, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-34, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-34, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-35, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-36, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-36, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-37, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-38, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-39, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-39, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-4, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-40, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-41, EXPECTED_RESULT_GOT_FAILURE
@@ -309,8 +309,8 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-42, EXPECTED_RES
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-43, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-44, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-45, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-46, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-47, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-46, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-47, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-48, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-49, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-5, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -362,14 +362,14 @@ Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-21, EXPECT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-22, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-23, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-24, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-25, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-25, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-26, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-27, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-28, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-27, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-28, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-29, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-3, EXPECTED_ERROR_GOT_FAILURE
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-30, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-31, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-31, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-32, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-33, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-34, EXPECTED_RESULT_GOT_ERROR
@@ -436,8 +436,8 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-41, EX
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-42, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-43, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-44, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-45, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-46, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-45, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-46, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-47, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-48, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-49, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -446,7 +446,7 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-50, EX
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-51, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-52, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-53, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-54, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-54, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-55, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-56, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-57, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -474,33 +474,33 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-78, EX
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-79, EXPECTED_ERROR_GOT_FAILURE
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-8, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-9, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-1, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-10, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-11, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-12, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-13, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-14, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-10, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-11, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-12, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-13, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-14, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-15, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-16, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-17, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-18, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-19, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-16, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-18, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-19, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-20, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-21, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-22, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-23, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-24, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-25, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-26, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-3, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-22, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-23, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-24, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-25, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-26, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-3, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-5, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-7, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-7, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-8, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-9, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConOther//K2-DirectConOther-1, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-9, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConOther//K2-DirectConOther-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConOther//K2-DirectConOther-10, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-11, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-12, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -531,22 +531,22 @@ Construct/DirectConOther//K2-DirectConOther-34, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConOther//K2-DirectConOther-35, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConOther//K2-DirectConOther-36, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConOther//K2-DirectConOther-37, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConOther//K2-DirectConOther-38, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConOther//K2-DirectConOther-38, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConOther//K2-DirectConOther-39, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConOther//K2-DirectConOther-4, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConOther//K2-DirectConOther-40, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConOther//K2-DirectConOther-41, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConOther//K2-DirectConOther-40, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConOther//K2-DirectConOther-41, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConOther//K2-DirectConOther-42, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-43, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-44, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConOther//K2-DirectConOther-45, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConOther//K2-DirectConOther-46, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConOther//K2-DirectConOther-47, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConOther//K2-DirectConOther-48, EXPECTED_ERROR_GOT_FAILURE
+Construct/DirectConOther//K2-DirectConOther-48, EXPECTED_ERROR_GOT_RESULT
 Construct/DirectConOther//K2-DirectConOther-49, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConOther//K2-DirectConOther-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConOther//K2-DirectConOther-50, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConOther//K2-DirectConOther-51, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConOther//K2-DirectConOther-50, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConOther//K2-DirectConOther-51, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConOther//K2-DirectConOther-52, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConOther//K2-DirectConOther-53, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConOther//K2-DirectConOther-54, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -641,8 +641,8 @@ Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-id-2, EXPECTED_
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-name-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-name-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-name-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-parent-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-string-1, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-parent-1, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-string-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//constattrerr-1, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-dash-1, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-dash-2, EXPECTED_ERROR_GOT_RESULT
@@ -663,7 +663,7 @@ Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-enclexpr-
 Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-nested-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-nested-2, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-nested-3, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-parent-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-parent-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-string-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-adjtext-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-adjtext-2, EXPECTED_RESULT_GOT_FAILURE
@@ -711,11 +711,11 @@ Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nested-1, EXPEC
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nested-2, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-2, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-3, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-4, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-5, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-parent-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-string-1, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-parent-1, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-string-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-1, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-10, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-11, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -751,37 +751,37 @@ Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-namexml-1, EXPECTED
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-namexml-2, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-namexml-3, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-namexml-4, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-parent-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-parent-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-string-1, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-string-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-adjtext-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-adjtext-2, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-adjtext-3, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-attr-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-attr-2, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-attr-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-2, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-3, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-4, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-1, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-2, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-data-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-doc-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-enclexpr-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-enclexpr-2, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-enclexpr-3, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-enclexpr-3, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-enclexpr-4, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nested-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nested-2, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nested-3, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nested-4, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nodeid-1, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nodeid-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nodeid-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nodeid-3, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nodeid-4, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nodeid-5, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-parent-1, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-parent-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-string-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConText//Constr-text-adjtext-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ConText//Constr-text-adjtext-2, EXPECTED_RESULT_GOT_ERROR
@@ -801,7 +801,7 @@ Expressions/Construct/ComputeCon/ConText//Constr-text-enclexpr-5, EXPECTED_RESUL
 Expressions/Construct/ComputeCon/ConText//Constr-text-nested-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConText//Constr-text-nested-2, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ConText//Constr-text-nested-3, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/ComputeCon/ConText//Constr-text-parent-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ConText//Constr-text-parent-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConText//Constr-text-string-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ConInScopeNamespace//Constr-inscope-1, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ConInScopeNamespace//Constr-inscope-10, EXPECTED_RESULT_GOT_FAILURE
@@ -831,8 +831,8 @@ Expressions/Construct/DirectConElem//Constr-elem-curlybr-5, EXPECTED_ERROR_GOT_S
 Expressions/Construct/DirectConElem//Constr-elem-curlybr-6, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/DirectConElem//Constr-elem-empty-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem//Constr-elem-empty-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-empty-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem//Constr-elem-empty-4, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/DirectConElem//Constr-elem-empty-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-empty-4, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/DirectConElem//Constr-elem-empty-5, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem//Constr-elem-matchtag-1, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/DirectConElem//Constr-elem-matchtag-2, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -855,16 +855,16 @@ Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-6, E
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-entref-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-entref-2, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-entref-2, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-id-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-id-2, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsdecl-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsdecl-2, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsdecl-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nspre-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nspre-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsprein-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsprein-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-parent-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-parent-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-10, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-2, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -909,11 +909,11 @@ Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-constrmod-
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-constrmod-8, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-data-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-doc-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-2, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-1, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-2, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-4, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-5, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-4, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-5, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-enclexpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-enclexpr-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-enclexpr-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -939,8 +939,8 @@ Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nested-4,
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nested-5, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-2, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-3, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-4, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-5, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-1, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-10, EXPECTED_ERROR_GOT_FAILURE
@@ -953,8 +953,8 @@ Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-6,
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-7, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-8, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-9, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-parent-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-string-1, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-parent-1, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-string-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-text-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-text-2, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-uripres-1, EXPECTED_RESULT_GOT_ERROR
@@ -1145,7 +1145,7 @@ Expressions/ExtensionExpression//extexpr-9, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/FLWORExpr/ForExpr//ForExpr001, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/FLWORExpr/ForExpr//ForExpr002, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/FLWORExpr/ForExpr//ForExpr003, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/ForExpr//ForExpr004, EXPECTED_RESULT_GOT_FAILURE
+Expressions/FLWORExpr/ForExpr//ForExpr004, EXPECTED_RESULT_GOT_ERROR
 Expressions/FLWORExpr/ForExpr//ForExpr005, EXPECTED_RESULT_GOT_FAILURE
 Expressions/FLWORExpr/ForExpr//ForExpr006, EXPECTED_RESULT_GOT_FAILURE
 Expressions/FLWORExpr/ForExpr//ForExpr007, EXPECTED_RESULT_GOT_FAILURE
@@ -5641,11 +5641,11 @@ Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-001, EXPECTED_RESULT_
 Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-002, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-003, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-004, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-005, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-006, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-007, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-005, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-006, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-007, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-008, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-009, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-009, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-010, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-011, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-012, EXPECTED_RESULT_GOT_ERROR
@@ -5664,11 +5664,11 @@ Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-001, EXPECTED_R
 Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-002, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-003, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-004, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-005, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-006, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-007, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-005, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-006, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-007, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-008, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-009, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-009, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-010, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-011, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-012, EXPECTED_RESULT_GOT_ERROR
@@ -5687,13 +5687,13 @@ Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-001, EXPECTED_RESULT_GO
 Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-002, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-003, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-004, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-005, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-005, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-006, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-007, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-007, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-008, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-009, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-009, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-010, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-011, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-011, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-012, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-013, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/SeqOp/SeqUnion//fn-union-node-args-014, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -5736,7 +5736,7 @@ Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-1, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-10, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-12, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-13, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-14, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-14, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-16, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-17, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-18, EXPECTED_RESULT_GOT_FAILURE
@@ -5851,13 +5851,13 @@ Expressions/PathExpr/Steps/Axes//Axes011, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/Axes//Axes011, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/Axes//Axes011, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/Axes//Axes012, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/PathExpr/Steps/Axes//Axes013, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/Steps/Axes//Axes014, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/Steps/Axes//Axes013, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/Steps/Axes//Axes014, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/Steps/Axes//Axes015, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/Steps/Axes//Axes016, EXPECTED_RESULT_GOT_ERROR
-Expressions/PathExpr/Steps/Axes//Axes017, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/Steps/Axes//Axes018, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/Steps/Axes//Axes019, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/Steps/Axes//Axes017, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/Steps/Axes//Axes018, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/Steps/Axes//Axes019, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/Steps/Axes//Axes020, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/Axes//Axes021, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/Axes//Axes023, EXPECTED_RESULT_GOT_FAILURE
@@ -5995,8 +5995,8 @@ Expressions/PathExpr/Steps/Axes//Axes084, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/Axes//Axes084, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/Axes//Axes084, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/Axes//Axes085, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/Steps/Axes//Axes086, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/Steps/Axes//Axes087, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/Steps/Axes//Axes086, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/Steps/Axes//Axes087, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/Steps/Axes//Axes088, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/PathExpr/Steps/Axes//Axes089, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/Steps/Axes//Axes090, EXPECTED_ERROR_GOT_FAILURE
@@ -6012,11 +6012,11 @@ Expressions/PathExpr/Steps/Axes//Axes099, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/PathExpr/Steps/Axes//Axes100, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/PathExpr/Steps/Axes//Axes101, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/PathExpr/Steps/Axes//Axes102, EXPECTED_RESULT_GOT_ERROR
-Expressions/PathExpr/Steps/Axes//Axes103, EXPECTED_ERROR_GOT_FAILURE
+Expressions/PathExpr/Steps/Axes//Axes103, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/PathExpr/Steps/Axes//Axes104, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/PathExpr/Steps/Axes//Axes105, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/PathExpr/Steps/Axes//Axes106, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/PathExpr/Steps/Axes//Axes107, EXPECTED_ERROR_GOT_FAILURE
+Expressions/PathExpr/Steps/Axes//Axes107, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/PathExpr/Steps/Axes//Axes108, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/PathExpr/Steps/Axes//Axes109, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/PathExpr/Steps/Axes//Axes110, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -6049,12 +6049,12 @@ Expressions/PathExpr/Steps/NodeTest//NodeTesthc-5, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/NodeTest//NodeTesthc-6, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/NodeTest//NodeTesthc-7, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/NodeTest//NodeTesthc-8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/Steps/NodeTest//nametest-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/Steps/NodeTest//nametest-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/PathExpr/Steps/NodeTest//nametest-10, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/Steps/NodeTest//nametest-11, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/Steps/NodeTest//nametest-12, EXPECTED_RESULT_GOT_ERROR
-Expressions/PathExpr/Steps/NodeTest//nametest-13, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/Steps/NodeTest//nametest-14, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/Steps/NodeTest//nametest-13, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/Steps/NodeTest//nametest-14, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/Steps/NodeTest//nametest-15, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/NodeTest//nametest-16, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/NodeTest//nametest-17, EXPECTED_RESULT_GOT_FAILURE
@@ -6102,7 +6102,7 @@ Expressions/PathExpr/UnabbrAxes//unabbreviatedSyntax-32, EXPECTED_RESULT_GOT_FAI
 Expressions/PathExpr/UnabbrAxes//unabbreviatedSyntax-33, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/UnabbrAxes//unabbreviatedSyntax-4, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/UnabbrAxes//unabbreviatedSyntax-5, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/UnabbrAxes//unabbreviatedSyntax-8, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/UnabbrAxes//unabbreviatedSyntax-8, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/UnabbrAxes//unabbreviatedSyntax-9, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PrimaryExpr/FunctionCallExpr//K-FunctionCallExpr-1, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/PrimaryExpr/FunctionCallExpr//K-FunctionCallExpr-10, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -6296,13 +6296,13 @@ Expressions/PrimaryExpr/ParenExpr//Parenexpr-11, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/PrimaryExpr/ParenExpr//Parenexpr-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/PrimaryExpr/ParenExpr//Parenexpr-13, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/PrimaryExpr/ParenExpr//Parenexpr-14, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/PrimaryExpr/ParenExpr//Parenexpr-15, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PrimaryExpr/ParenExpr//Parenexpr-16, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PrimaryExpr/ParenExpr//Parenexpr-15, EXPECTED_RESULT_GOT_ERROR
+Expressions/PrimaryExpr/ParenExpr//Parenexpr-16, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrimaryExpr/ParenExpr//Parenexpr-17, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/PrimaryExpr/ParenExpr//Parenexpr-18, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/PrimaryExpr/ParenExpr//Parenexpr-19, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PrimaryExpr/ParenExpr//Parenexpr-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/PrimaryExpr/ParenExpr//Parenexpr-20, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PrimaryExpr/ParenExpr//Parenexpr-20, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrimaryExpr/ParenExpr//Parenexpr-3, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/PrimaryExpr/ParenExpr//Parenexpr-4, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/PrimaryExpr/ParenExpr//Parenexpr-5, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -6415,14 +6415,14 @@ Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-16, EXPECTED_RESULT_G
 Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-17, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-18, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-19, EXPECTED_RESULT_GOT_ERROR
-Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-2, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-20, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-21, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-22, EXPECTED_RESULT_GOT_ERROR
-Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-4, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-5, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-6, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-3, EXPECTED_RESULT_GOT_ERROR
+Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-4, EXPECTED_RESULT_GOT_ERROR
+Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-5, EXPECTED_RESULT_GOT_ERROR
+Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-6, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-7, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-8, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-9, EXPECTED_RESULT_GOT_ERROR
@@ -6475,7 +6475,7 @@ Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-17, EXPECTED_RESULT_GOT_
 Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-18, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-2, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-20, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-21, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-21, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-22, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-23, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PrologExpr/DefaultOrderingProlog//orderDecl-4, EXPECTED_RESULT_GOT_ERROR
@@ -8218,7 +8218,7 @@ Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1206, EXPECTED_ERROR_GOT_SAM
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1207, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1208, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1209, EXPECTED_ERROR_GOT_FAILURE
-Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-121, EXPECTED_ERROR_GOT_RESULT
+Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-121, EXPECTED_ERROR_GOT_FAILURE
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1210, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1211, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1212, EXPECTED_RESULT_GOT_ERROR
@@ -8229,7 +8229,7 @@ Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1216, EXPECTED_RESULT_GOT_SA
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1217, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1218, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1219, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-122, EXPECTED_ERROR_GOT_RESULT
+Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-122, EXPECTED_ERROR_GOT_FAILURE
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1220, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1221, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1222, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -10525,7 +10525,7 @@ FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-1, EXPECTED_ERROR_GOT_SAME_E
 FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-10, EXPECTED_ERROR_GOT_RESULT
 FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-13, EXPECTED_RESULT_GOT_FAILURE
+FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-13, EXPECTED_RESULT_GOT_SAME_RESULT
 FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-14, EXPECTED_RESULT_GOT_FAILURE
 FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-15, EXPECTED_RESULT_GOT_SAME_RESULT
 FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-16, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -10580,11 +10580,11 @@ FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-19, EXPECTED_ERROR_GOT_RESUL
 FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-2, EXPECTED_RESULT_GOT_ERROR
 FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-20, EXPECTED_RESULT_GOT_FAILURE
 FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-21, EXPECTED_RESULT_GOT_FAILURE
-FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-22, EXPECTED_RESULT_GOT_FAILURE
-FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-23, EXPECTED_RESULT_GOT_ERROR
+FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-22, EXPECTED_RESULT_GOT_SAME_RESULT
+FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-23, EXPECTED_RESULT_GOT_FAILURE
 FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-24, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-25, EXPECTED_RESULT_GOT_SAME_RESULT
-FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-26, EXPECTED_ERROR_GOT_FAILURE
+FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-26, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-5, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -10629,7 +10629,7 @@ FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-4, EXPECTED_ERRO
 FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-40, EXPECTED_ERROR_GOT_RESULT
 FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-41, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-42, NO_RESULT_FILE
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-43, EXPECTED_RESULT_GOT_FAILURE
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-43, EXPECTED_RESULT_GOT_SAME_RESULT
 FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-44, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-45, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-46, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -10644,10 +10644,10 @@ FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-9, EXPECTED_ERRO
 FLWORExpr/ReturnExpr//K2-ReturnExpr-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 FLWORExpr/WhereExpr//K2-WhereExpr-1, EXPECTED_ERROR_GOT_SAME_ERROR
 FLWORExpr/WhereExpr//K2-WhereExpr-2, EXPECTED_ERROR_GOT_SAME_ERROR
-FullAxis/ancestor-or-selfAxis//ancestorself-1, EXPECTED_ERROR_GOT_FAILURE
+FullAxis/ancestor-or-selfAxis//ancestorself-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 FullAxis/ancestor-or-selfAxis//ancestorself-10, EXPECTED_RESULT_GOT_ERROR
-FullAxis/ancestor-or-selfAxis//ancestorself-11, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/ancestor-or-selfAxis//ancestorself-12, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/ancestor-or-selfAxis//ancestorself-11, EXPECTED_RESULT_GOT_ERROR
+FullAxis/ancestor-or-selfAxis//ancestorself-12, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestor-or-selfAxis//ancestorself-13, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestor-or-selfAxis//ancestorself-14, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestor-or-selfAxis//ancestorself-15, EXPECTED_RESULT_GOT_ERROR
@@ -10657,7 +10657,7 @@ FullAxis/ancestor-or-selfAxis//ancestorself-18, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestor-or-selfAxis//ancestorself-19, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestor-or-selfAxis//ancestorself-2, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestor-or-selfAxis//ancestorself-20, EXPECTED_RESULT_GOT_ERROR
-FullAxis/ancestor-or-selfAxis//ancestorself-21, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/ancestor-or-selfAxis//ancestorself-21, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestor-or-selfAxis//ancestorself-3, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestor-or-selfAxis//ancestorself-4, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestor-or-selfAxis//ancestorself-5, EXPECTED_RESULT_GOT_ERROR
@@ -10666,10 +10666,10 @@ FullAxis/ancestor-or-selfAxis//ancestorself-7, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestor-or-selfAxis//ancestorself-8, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestor-or-selfAxis//ancestorself-9, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestor-or-selfAxis//unabbreviatedSyntax-11, EXPECTED_RESULT_GOT_ERROR
-FullAxis/ancestorAxis//ancestor-1, EXPECTED_ERROR_GOT_FAILURE
+FullAxis/ancestorAxis//ancestor-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 FullAxis/ancestorAxis//ancestor-10, EXPECTED_RESULT_GOT_ERROR
-FullAxis/ancestorAxis//ancestor-11, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/ancestorAxis//ancestor-12, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/ancestorAxis//ancestor-11, EXPECTED_RESULT_GOT_ERROR
+FullAxis/ancestorAxis//ancestor-12, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestorAxis//ancestor-13, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestorAxis//ancestor-14, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestorAxis//ancestor-15, EXPECTED_RESULT_GOT_ERROR
@@ -10679,7 +10679,7 @@ FullAxis/ancestorAxis//ancestor-18, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestorAxis//ancestor-19, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestorAxis//ancestor-2, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestorAxis//ancestor-20, EXPECTED_RESULT_GOT_ERROR
-FullAxis/ancestorAxis//ancestor-21, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/ancestorAxis//ancestor-21, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestorAxis//ancestor-3, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestorAxis//ancestor-4, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestorAxis//ancestor-5, EXPECTED_RESULT_GOT_ERROR
@@ -10688,10 +10688,10 @@ FullAxis/ancestorAxis//ancestor-7, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestorAxis//ancestor-8, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestorAxis//ancestor-9, EXPECTED_RESULT_GOT_ERROR
 FullAxis/ancestorAxis//unabbreviatedSyntax-10, EXPECTED_RESULT_GOT_ERROR
-FullAxis/following-siblingAxis//followingsibling-1, EXPECTED_ERROR_GOT_FAILURE
+FullAxis/following-siblingAxis//followingsibling-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 FullAxis/following-siblingAxis//followingsibling-10, EXPECTED_RESULT_GOT_ERROR
-FullAxis/following-siblingAxis//followingsibling-11, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/following-siblingAxis//followingsibling-12, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/following-siblingAxis//followingsibling-11, EXPECTED_RESULT_GOT_ERROR
+FullAxis/following-siblingAxis//followingsibling-12, EXPECTED_RESULT_GOT_ERROR
 FullAxis/following-siblingAxis//followingsibling-13, EXPECTED_RESULT_GOT_ERROR
 FullAxis/following-siblingAxis//followingsibling-14, EXPECTED_RESULT_GOT_ERROR
 FullAxis/following-siblingAxis//followingsibling-15, EXPECTED_RESULT_GOT_ERROR
@@ -10701,7 +10701,7 @@ FullAxis/following-siblingAxis//followingsibling-18, EXPECTED_RESULT_GOT_ERROR
 FullAxis/following-siblingAxis//followingsibling-19, EXPECTED_RESULT_GOT_ERROR
 FullAxis/following-siblingAxis//followingsibling-2, EXPECTED_RESULT_GOT_ERROR
 FullAxis/following-siblingAxis//followingsibling-20, EXPECTED_RESULT_GOT_ERROR
-FullAxis/following-siblingAxis//followingsibling-21, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/following-siblingAxis//followingsibling-21, EXPECTED_RESULT_GOT_ERROR
 FullAxis/following-siblingAxis//followingsibling-3, EXPECTED_RESULT_GOT_ERROR
 FullAxis/following-siblingAxis//followingsibling-4, EXPECTED_RESULT_GOT_ERROR
 FullAxis/following-siblingAxis//followingsibling-5, EXPECTED_RESULT_GOT_ERROR
@@ -10710,10 +10710,10 @@ FullAxis/following-siblingAxis//followingsibling-7, EXPECTED_RESULT_GOT_ERROR
 FullAxis/following-siblingAxis//followingsibling-8, EXPECTED_RESULT_GOT_ERROR
 FullAxis/following-siblingAxis//followingsibling-9, EXPECTED_RESULT_GOT_ERROR
 FullAxis/following-siblingAxis//unabbreviatedSyntax-24, EXPECTED_RESULT_GOT_ERROR
-FullAxis/followingAxis//following-1, EXPECTED_ERROR_GOT_FAILURE
+FullAxis/followingAxis//following-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 FullAxis/followingAxis//following-10, EXPECTED_RESULT_GOT_ERROR
-FullAxis/followingAxis//following-11, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/followingAxis//following-12, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/followingAxis//following-11, EXPECTED_RESULT_GOT_ERROR
+FullAxis/followingAxis//following-12, EXPECTED_RESULT_GOT_ERROR
 FullAxis/followingAxis//following-13, EXPECTED_RESULT_GOT_ERROR
 FullAxis/followingAxis//following-14, EXPECTED_RESULT_GOT_ERROR
 FullAxis/followingAxis//following-15, EXPECTED_RESULT_GOT_ERROR
@@ -10723,7 +10723,7 @@ FullAxis/followingAxis//following-18, EXPECTED_RESULT_GOT_ERROR
 FullAxis/followingAxis//following-19, EXPECTED_RESULT_GOT_ERROR
 FullAxis/followingAxis//following-2, EXPECTED_RESULT_GOT_ERROR
 FullAxis/followingAxis//following-20, EXPECTED_RESULT_GOT_ERROR
-FullAxis/followingAxis//following-21, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/followingAxis//following-21, EXPECTED_RESULT_GOT_ERROR
 FullAxis/followingAxis//following-3, EXPECTED_RESULT_GOT_ERROR
 FullAxis/followingAxis//following-4, EXPECTED_RESULT_GOT_ERROR
 FullAxis/followingAxis//following-5, EXPECTED_RESULT_GOT_ERROR
@@ -10731,10 +10731,10 @@ FullAxis/followingAxis//following-6, EXPECTED_RESULT_GOT_ERROR
 FullAxis/followingAxis//following-7, EXPECTED_RESULT_GOT_ERROR
 FullAxis/followingAxis//following-8, EXPECTED_RESULT_GOT_ERROR
 FullAxis/followingAxis//following-9, EXPECTED_RESULT_GOT_ERROR
-FullAxis/preceding-siblingAxis//preceding-sibling-1, EXPECTED_ERROR_GOT_FAILURE
+FullAxis/preceding-siblingAxis//preceding-sibling-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 FullAxis/preceding-siblingAxis//preceding-sibling-10, EXPECTED_RESULT_GOT_ERROR
-FullAxis/preceding-siblingAxis//preceding-sibling-11, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/preceding-siblingAxis//preceding-sibling-12, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/preceding-siblingAxis//preceding-sibling-11, EXPECTED_RESULT_GOT_ERROR
+FullAxis/preceding-siblingAxis//preceding-sibling-12, EXPECTED_RESULT_GOT_ERROR
 FullAxis/preceding-siblingAxis//preceding-sibling-13, EXPECTED_RESULT_GOT_ERROR
 FullAxis/preceding-siblingAxis//preceding-sibling-14, EXPECTED_RESULT_GOT_ERROR
 FullAxis/preceding-siblingAxis//preceding-sibling-15, EXPECTED_RESULT_GOT_ERROR
@@ -10744,7 +10744,7 @@ FullAxis/preceding-siblingAxis//preceding-sibling-18, EXPECTED_RESULT_GOT_ERROR
 FullAxis/preceding-siblingAxis//preceding-sibling-19, EXPECTED_RESULT_GOT_ERROR
 FullAxis/preceding-siblingAxis//preceding-sibling-2, EXPECTED_RESULT_GOT_ERROR
 FullAxis/preceding-siblingAxis//preceding-sibling-20, EXPECTED_RESULT_GOT_ERROR
-FullAxis/preceding-siblingAxis//preceding-sibling-21, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/preceding-siblingAxis//preceding-sibling-21, EXPECTED_RESULT_GOT_ERROR
 FullAxis/preceding-siblingAxis//preceding-sibling-3, EXPECTED_RESULT_GOT_ERROR
 FullAxis/preceding-siblingAxis//preceding-sibling-4, EXPECTED_RESULT_GOT_ERROR
 FullAxis/preceding-siblingAxis//preceding-sibling-5, EXPECTED_RESULT_GOT_ERROR
@@ -10753,10 +10753,10 @@ FullAxis/preceding-siblingAxis//preceding-sibling-7, EXPECTED_RESULT_GOT_ERROR
 FullAxis/preceding-siblingAxis//preceding-sibling-8, EXPECTED_RESULT_GOT_ERROR
 FullAxis/preceding-siblingAxis//preceding-sibling-9, EXPECTED_RESULT_GOT_ERROR
 FullAxis/preceding-siblingAxis//unabbreviatedSyntax-25, EXPECTED_RESULT_GOT_ERROR
-FullAxis/precedingAxis//preceding-1, EXPECTED_ERROR_GOT_FAILURE
+FullAxis/precedingAxis//preceding-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 FullAxis/precedingAxis//preceding-10, EXPECTED_RESULT_GOT_ERROR
-FullAxis/precedingAxis//preceding-11, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/precedingAxis//preceding-12, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/precedingAxis//preceding-11, EXPECTED_RESULT_GOT_ERROR
+FullAxis/precedingAxis//preceding-12, EXPECTED_RESULT_GOT_ERROR
 FullAxis/precedingAxis//preceding-13, EXPECTED_RESULT_GOT_ERROR
 FullAxis/precedingAxis//preceding-14, EXPECTED_RESULT_GOT_ERROR
 FullAxis/precedingAxis//preceding-15, EXPECTED_RESULT_GOT_ERROR
@@ -10766,9 +10766,9 @@ FullAxis/precedingAxis//preceding-18, EXPECTED_RESULT_GOT_ERROR
 FullAxis/precedingAxis//preceding-19, EXPECTED_RESULT_GOT_ERROR
 FullAxis/precedingAxis//preceding-2, EXPECTED_RESULT_GOT_ERROR
 FullAxis/precedingAxis//preceding-20, EXPECTED_RESULT_GOT_ERROR
-FullAxis/precedingAxis//preceding-21, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/precedingAxis//preceding-22, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/precedingAxis//preceding-23, EXPECTED_RESULT_GOT_FAILURE
+FullAxis/precedingAxis//preceding-21, EXPECTED_RESULT_GOT_ERROR
+FullAxis/precedingAxis//preceding-22, EXPECTED_RESULT_GOT_ERROR
+FullAxis/precedingAxis//preceding-23, EXPECTED_RESULT_GOT_ERROR
 FullAxis/precedingAxis//preceding-3, EXPECTED_RESULT_GOT_ERROR
 FullAxis/precedingAxis//preceding-4, EXPECTED_RESULT_GOT_ERROR
 FullAxis/precedingAxis//preceding-5, EXPECTED_RESULT_GOT_ERROR
@@ -10890,9 +10890,9 @@ FunctX/functx-fn-distinct-values//functx-fn-distinct-values-1, EXPECTED_RESULT_G
 FunctX/functx-fn-distinct-values//functx-fn-distinct-values-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 FunctX/functx-fn-distinct-values//functx-fn-distinct-values-3, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-fn-distinct-values//functx-fn-distinct-values-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-FunctX/functx-fn-distinct-values//functx-fn-distinct-values-5, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-fn-distinct-values//functx-fn-distinct-values-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 FunctX/functx-fn-distinct-values//functx-fn-distinct-values-6, EXPECTED_RESULT_GOT_SAME_RESULT
-FunctX/functx-fn-distinct-values//functx-fn-distinct-values-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-fn-distinct-values//functx-fn-distinct-values-all, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-fn-doc-available//functx-fn-doc-available-1, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-fn-empty//functx-fn-empty-1, EXPECTED_RESULT_GOT_SAME_RESULT
 FunctX/functx-fn-empty//functx-fn-empty-2, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -11085,10 +11085,10 @@ FunctX/functx-fn-number//functx-fn-number-all, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-fn-one-or-more//functx-fn-one-or-more-1, EXPECTED_RESULT_GOT_SAME_RESULT
 FunctX/functx-fn-one-or-more//functx-fn-one-or-more-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 FunctX/functx-fn-one-or-more//functx-fn-one-or-more-all, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-FunctX/functx-fn-position//functx-fn-position-1, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-fn-position//functx-fn-position-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 FunctX/functx-fn-position//functx-fn-position-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 FunctX/functx-fn-position//functx-fn-position-3, EXPECTED_RESULT_GOT_SAME_RESULT
-FunctX/functx-fn-position//functx-fn-position-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-fn-position//functx-fn-position-all, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 FunctX/functx-fn-prefix-from-QName//functx-fn-prefix-from-QName-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-fn-prefix-from-QName//functx-fn-prefix-from-QName-2, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-fn-prefix-from-QName//functx-fn-prefix-from-QName-3, EXPECTED_RESULT_GOT_ERROR
@@ -11182,10 +11182,10 @@ FunctX/functx-fn-string-to-codepoints//functx-fn-string-to-codepoints-1, EXPECTE
 FunctX/functx-fn-string-to-codepoints//functx-fn-string-to-codepoints-2, EXPECTED_RESULT_GOT_SAME_RESULT
 FunctX/functx-fn-string-to-codepoints//functx-fn-string-to-codepoints-3, EXPECTED_RESULT_GOT_SAME_RESULT
 FunctX/functx-fn-string-to-codepoints//functx-fn-string-to-codepoints-all, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-FunctX/functx-fn-string//functx-fn-string-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-fn-string//functx-fn-string-2, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-fn-string//functx-fn-string-3, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-fn-string//functx-fn-string-all, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-fn-string//functx-fn-string-1, EXPECTED_RESULT_GOT_SAME_RESULT
+FunctX/functx-fn-string//functx-fn-string-2, EXPECTED_RESULT_GOT_SAME_RESULT
+FunctX/functx-fn-string//functx-fn-string-3, EXPECTED_RESULT_GOT_SAME_RESULT
+FunctX/functx-fn-string//functx-fn-string-all, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 FunctX/functx-fn-subsequence//functx-fn-subsequence-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 FunctX/functx-fn-subsequence//functx-fn-subsequence-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 FunctX/functx-fn-subsequence//functx-fn-subsequence-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -11406,9 +11406,9 @@ FunctX/functx-functx-distinct-element-names//functx-functx-distinct-element-name
 FunctX/functx-functx-distinct-element-paths//functx-functx-distinct-element-paths-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-distinct-element-paths//functx-functx-distinct-element-paths-2, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-distinct-element-paths//functx-functx-distinct-element-paths-all, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-distinct-nodes//functx-functx-distinct-nodes-1, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-distinct-nodes//functx-functx-distinct-nodes-2, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-distinct-nodes//functx-functx-distinct-nodes-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-distinct-nodes//functx-functx-distinct-nodes-1, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-distinct-nodes//functx-functx-distinct-nodes-2, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-distinct-nodes//functx-functx-distinct-nodes-all, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-duration-from-timezone//functx-functx-duration-from-timezone-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-duration-from-timezone//functx-functx-duration-from-timezone-2, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-duration-from-timezone//functx-functx-duration-from-timezone-3, EXPECTED_RESULT_GOT_ERROR
@@ -11618,18 +11618,18 @@ FunctX/functx-functx-max-line-length//functx-functx-max-line-length-1, EXPECTED_
 FunctX/functx-functx-max-line-length//functx-functx-max-line-length-2, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-max-line-length//functx-functx-max-line-length-all, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-max-node//functx-functx-max-node-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-max-string//functx-functx-max-string-1, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-max-string//functx-functx-max-string-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-max-string//functx-functx-max-string-2, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-max-string//functx-functx-max-string-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-max-string//functx-functx-max-string-all, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-min-determine-type//functx-functx-min-determine-type-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-min-determine-type//functx-functx-min-determine-type-2, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-min-determine-type//functx-functx-min-determine-type-3, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-min-determine-type//functx-functx-min-determine-type-all, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-min-node//functx-functx-min-node-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-min-non-empty-string//functx-functx-min-non-empty-string-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-min-string//functx-functx-min-string-1, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-min-string//functx-functx-min-string-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-min-string//functx-functx-min-string-2, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-min-string//functx-functx-min-string-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-min-string//functx-functx-min-string-all, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-mmddyyyy-to-date//functx-functx-mmddyyyy-to-date-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-mmddyyyy-to-date//functx-functx-mmddyyyy-to-date-2, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-mmddyyyy-to-date//functx-functx-mmddyyyy-to-date-3, EXPECTED_RESULT_GOT_ERROR
@@ -11654,11 +11654,11 @@ FunctX/functx-functx-next-day//functx-functx-next-day-2, EXPECTED_RESULT_GOT_ERR
 FunctX/functx-functx-next-day//functx-functx-next-day-all, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-node-kind//functx-functx-node-kind-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-node-kind//functx-functx-node-kind-2, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-node-kind//functx-functx-node-kind-3, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-node-kind//functx-functx-node-kind-4, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-node-kind//functx-functx-node-kind-3, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-node-kind//functx-functx-node-kind-4, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-node-kind//functx-functx-node-kind-5, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-node-kind//functx-functx-node-kind-6, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-node-kind//functx-functx-node-kind-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-node-kind//functx-functx-node-kind-all, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-non-distinct-values//functx-functx-non-distinct-values-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-non-distinct-values//functx-functx-non-distinct-values-2, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-non-distinct-values//functx-functx-non-distinct-values-3, EXPECTED_RESULT_GOT_ERROR
@@ -11679,11 +11679,11 @@ FunctX/functx-functx-pad-string-to-length//functx-functx-pad-string-to-length-2,
 FunctX/functx-functx-pad-string-to-length//functx-functx-pad-string-to-length-3, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-pad-string-to-length//functx-functx-pad-string-to-length-all, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-path-to-node-with-pos//functx-functx-path-to-node-with-pos-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-path-to-node-with-pos//functx-functx-path-to-node-with-pos-2, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-path-to-node-with-pos//functx-functx-path-to-node-with-pos-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-path-to-node-with-pos//functx-functx-path-to-node-with-pos-2, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-path-to-node-with-pos//functx-functx-path-to-node-with-pos-all, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-path-to-node//functx-functx-path-to-node-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-path-to-node//functx-functx-path-to-node-2, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-path-to-node//functx-functx-path-to-node-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-path-to-node//functx-functx-path-to-node-2, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-path-to-node//functx-functx-path-to-node-all, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-precedes-not-ancestor//functx-functx-precedes-not-ancestor-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-precedes-not-ancestor//functx-functx-precedes-not-ancestor-2, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-precedes-not-ancestor//functx-functx-precedes-not-ancestor-3, EXPECTED_RESULT_GOT_ERROR
@@ -11745,30 +11745,30 @@ FunctX/functx-functx-scheme-from-uri//functx-functx-scheme-from-uri-3, EXPECTED_
 FunctX/functx-functx-scheme-from-uri//functx-functx-scheme-from-uri-4, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-scheme-from-uri//functx-functx-scheme-from-uri-5, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-scheme-from-uri//functx-functx-scheme-from-uri-all, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sequence-deep-equal//functx-functx-sequence-deep-equal-1, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sequence-deep-equal//functx-functx-sequence-deep-equal-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-sequence-deep-equal//functx-functx-sequence-deep-equal-2, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-sequence-deep-equal//functx-functx-sequence-deep-equal-3, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sequence-deep-equal//functx-functx-sequence-deep-equal-all, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-1, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sequence-deep-equal//functx-functx-sequence-deep-equal-all, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-2, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-3, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-all, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-1, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-all, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-2, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-3, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-all, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-sequence-type//functx-functx-sequence-type-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-10, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-11, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sequence-type//functx-functx-sequence-type-10, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sequence-type//functx-functx-sequence-type-11, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-sequence-type//functx-functx-sequence-type-2, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-sequence-type//functx-functx-sequence-type-3, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-sequence-type//functx-functx-sequence-type-4, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-5, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-6, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-7, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-8, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-9, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sequence-type//functx-functx-sequence-type-5, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sequence-type//functx-functx-sequence-type-6, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sequence-type//functx-functx-sequence-type-7, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sequence-type//functx-functx-sequence-type-8, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sequence-type//functx-functx-sequence-type-9, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sequence-type//functx-functx-sequence-type-all, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-siblings-same-name//functx-functx-siblings-same-name-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-siblings-same-name//functx-functx-siblings-same-name-2, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-siblings-same-name//functx-functx-siblings-same-name-all, EXPECTED_RESULT_GOT_ERROR
@@ -11776,15 +11776,15 @@ FunctX/functx-functx-siblings//functx-functx-siblings-1, EXPECTED_RESULT_GOT_ERR
 FunctX/functx-functx-siblings//functx-functx-siblings-2, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-siblings//functx-functx-siblings-all, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-sort-as-numeric//functx-functx-sort-as-numeric-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sort-as-numeric//functx-functx-sort-as-numeric-2, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sort-as-numeric//functx-functx-sort-as-numeric-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sort-as-numeric//functx-functx-sort-as-numeric-2, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sort-as-numeric//functx-functx-sort-as-numeric-all, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-sort-case-insensitive//functx-functx-sort-case-insensitive-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sort-case-insensitive//functx-functx-sort-case-insensitive-2, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sort-case-insensitive//functx-functx-sort-case-insensitive-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sort-case-insensitive//functx-functx-sort-case-insensitive-2, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sort-case-insensitive//functx-functx-sort-case-insensitive-all, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-sort-document-order//functx-functx-sort-document-order-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-sort//functx-functx-sort-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sort//functx-functx-sort-2, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sort//functx-functx-sort-all, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sort//functx-functx-sort-2, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sort//functx-functx-sort-all, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-substring-after-if-contains//functx-functx-substring-after-if-contains-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-substring-after-if-contains//functx-functx-substring-after-if-contains-2, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-substring-after-if-contains//functx-functx-substring-after-if-contains-all, EXPECTED_RESULT_GOT_ERROR
@@ -11906,9 +11906,9 @@ FunctX/functx-functx-yyyymmdd-to-date//functx-functx-yyyymmdd-to-date-all, EXPEC
 Functions/AccessorFunc/BaseURIFunc//K-BaseURIFun

<TRUNCATED>

[2/4] vxquery git commit: Updated the XQTS stored results.

Posted by pr...@apache.org.
Updated the XQTS stored results.


Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/bf8ab735
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/bf8ab735
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/bf8ab735

Branch: refs/heads/master
Commit: bf8ab7356271910778c1fe636e706f9c6c86c87a
Parents: d7c32f8
Author: Preston Carman <pr...@apache.org>
Authored: Fri Mar 4 10:21:11 2016 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Fri Mar 4 10:21:11 2016 -0800

----------------------------------------------------------------------
 vxquery-xtest/results/xqts.txt | 742 ++++++++++++++++++------------------
 1 file changed, 371 insertions(+), 371 deletions(-)
----------------------------------------------------------------------



[3/4] vxquery git commit: Switched the xqts fiel to use version sort order. Easier to read.

Posted by pr...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/43852a54/vxquery-xtest/results/xqts.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/results/xqts.txt b/vxquery-xtest/results/xqts.txt
index 0431f9a..9e38137 100644
--- a/vxquery-xtest/results/xqts.txt
+++ b/vxquery-xtest/results/xqts.txt
@@ -30,6 +30,14 @@ Basics/EQNames//eqname-902, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Basics/EQNames//eqname-903, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Basics/StaticContext//static-context-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Basics/Types/SequenceTypeSyntax//sequence-type-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-2, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-3, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-4, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-5, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-6, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-7, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-8, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/Types/SequenceTypeSyntax//sequence-type-9, EXPECTED_RESULT_GOT_SAME_RESULT
 Basics/Types/SequenceTypeSyntax//sequence-type-10, EXPECTED_RESULT_GOT_SAME_RESULT
 Basics/Types/SequenceTypeSyntax//sequence-type-11, EXPECTED_RESULT_GOT_SAME_RESULT
 Basics/Types/SequenceTypeSyntax//sequence-type-12, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -40,16 +48,8 @@ Basics/Types/SequenceTypeSyntax//sequence-type-16, EXPECTED_RESULT_GOT_SAME_RESU
 Basics/Types/SequenceTypeSyntax//sequence-type-17, EXPECTED_RESULT_GOT_SAME_RESULT
 Basics/Types/SequenceTypeSyntax//sequence-type-18, EXPECTED_RESULT_GOT_SAME_RESULT
 Basics/Types/SequenceTypeSyntax//sequence-type-19, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-2, EXPECTED_RESULT_GOT_SAME_RESULT
 Basics/Types/SequenceTypeSyntax//sequence-type-20, EXPECTED_RESULT_GOT_SAME_RESULT
 Basics/Types/SequenceTypeSyntax//sequence-type-21, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-6, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-8, EXPECTED_RESULT_GOT_SAME_RESULT
-Basics/Types/SequenceTypeSyntax//sequence-type-9, EXPECTED_RESULT_GOT_SAME_RESULT
 Catalog//Catalog001, EXPECTED_RESULT_GOT_ERROR
 Catalog//Catalog002, EXPECTED_RESULT_GOT_FAILURE
 Catalog//Catalog003, EXPECTED_RESULT_GOT_FAILURE
@@ -61,6 +61,14 @@ CondExpr//K2-CondExpr-5, EXPECTED_ERROR_GOT_SAME_ERROR
 CondExpr//K2-CondExpr-6, EXPECTED_ERROR_GOT_SAME_ERROR
 CondExpr//K2-CondExpr-7, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-1, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-2, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-4, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-8, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-9, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-12, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -71,7 +79,6 @@ Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-16, EXPECTED_ERROR_GOT_DI
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-17, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-18, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-19, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-2, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-20, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-21, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-22, EXPECTED_ERROR_GOT_FAILURE
@@ -82,7 +89,6 @@ Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-26, EXPECTED_RESULT_GOT_E
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-27, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-28, EXPECTED_ERROR_GOT_FAILURE
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-29, EXPECTED_ERROR_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-3, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-30, EXPECTED_RESULT_GOT_FAILURE
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-31, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-32, EXPECTED_RESULT_GOT_ERROR
@@ -93,7 +99,6 @@ Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-36, EXPECTED_RESULT_GOT_D
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-37, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-38, EXPECTED_ERROR_GOT_RESULT
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-39, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-4, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-40, EXPECTED_ERROR_GOT_RESULT
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-41, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-42, EXPECTED_ERROR_GOT_RESULT
@@ -104,7 +109,6 @@ Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-46, EXPECTED_ERROR_GOT_RE
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-47, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-48, EXPECTED_ERROR_GOT_RESULT
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-49, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-5, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-50, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-51, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-52, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -115,12 +119,8 @@ Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-56, EXPECTED_RESULT_GOT_E
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-57, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-58, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-59, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-6, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-60, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-61, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-7, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-8, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-9, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-1, EXPECTED_ERROR_GOT_RESULT
 Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-2, EXPECTED_ERROR_GOT_RESULT
 Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-3, EXPECTED_ERROR_GOT_RESULT
@@ -134,12 +134,6 @@ Construct/ComputeCon/ComputeConComment//K2-ComputeConComment-3, EXPECTED_RESULT_
 Construct/ComputeCon/ComputeConComment//K2-ComputeConComment-4, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/ComputeCon/ComputeConComment//K2-ComputeConComment-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-1, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-10, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-11, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-12, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-13, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-14, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-15, EXPECTED_RESULT_GOT_FAILURE
 Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-4, EXPECTED_ERROR_GOT_RESULT
@@ -148,6 +142,12 @@ Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-6, EXPECTED_RESULT_GOT_SA
 Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-8, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-9, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-10, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-11, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-12, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-13, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-14, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-15, EXPECTED_RESULT_GOT_FAILURE
 Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-1, EXPECTED_ERROR_GOT_RESULT
 Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-2, EXPECTED_ERROR_GOT_RESULT
 Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-3, EXPECTED_ERROR_GOT_RESULT
@@ -155,8 +155,6 @@ Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-4, EXPECTED_ERROR_GOT_RE
 Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-5, EXPECTED_ERROR_GOT_RESULT
 Construct/ComputeCon/ComputeConElem//comp-elem-bad-name-6, EXPECTED_ERROR_GOT_RESULT
 Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-1, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-2, EXPECTED_ERROR_GOT_RESULT
 Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-3, EXPECTED_ERROR_GOT_RESULT
 Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-4, EXPECTED_RESULT_GOT_ERROR
@@ -165,7 +163,17 @@ Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-6, EXPECTED_ERROR_GOT_RESULT
 Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-7, EXPECTED_ERROR_GOT_RESULT
 Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-8, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-9, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-1, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-2, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-5, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-6, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-7, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-8, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-9, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-10, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-11, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-12, EXPECTED_RESULT_GOT_ERROR
@@ -176,7 +184,6 @@ Construct/ComputeCon/ConDocNode//K2-ConDocNode-16, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-17, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-18, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-19, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-2, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-20, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-21, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-22, EXPECTED_RESULT_GOT_ERROR
@@ -187,23 +194,10 @@ Construct/ComputeCon/ConDocNode//K2-ConDocNode-26, EXPECTED_ERROR_GOT_DIFFERENT_
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-27, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-28, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-29, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-30, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-31, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-32, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-5, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-6, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-7, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-8, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-9, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConText//K2-ConText-1, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ConText//K2-ConText-10, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/ComputeCon/ConText//K2-ConText-11, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ConText//K2-ConText-12, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ConText//K2-ConText-13, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ConText//K2-ConText-14, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/ComputeCon/ConText//K2-ConText-15, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/ComputeCon/ConText//K2-ConText-2, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/ComputeCon/ConText//K2-ConText-3, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/ComputeCon/ConText//K2-ConText-4, EXPECTED_RESULT_GOT_ERROR
@@ -212,64 +206,24 @@ Construct/ComputeCon/ConText//K2-ConText-6, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/ComputeCon/ConText//K2-ConText-7, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/ComputeCon/ConText//K2-ConText-8, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/ComputeCon/ConText//K2-ConText-9, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/ComputeCon/ConText//K2-ConText-10, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/ComputeCon/ConText//K2-ConText-11, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ConText//K2-ConText-12, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ConText//K2-ConText-13, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ConText//K2-ConText-14, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/ComputeCon/ConText//K2-ConText-15, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/ConInScopeNamespace//K2-ConInScopeNamespace-1, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem//K2-DirectConElem-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-10, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/DirectConElem//K2-DirectConElem-11, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-12, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-13, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-14, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-15, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-16, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-17, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-18, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-19, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-20, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-21, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-22, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-23, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-24, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-25, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-26, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-27, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-28, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-29, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem//K2-DirectConElem-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-30, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-31, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem//K2-DirectConElem-32, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-33, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem//K2-DirectConElem-34, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem//K2-DirectConElem-35, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConElem//K2-DirectConElem-36, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConElem//K2-DirectConElem-37, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConElem//K2-DirectConElem-38, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-39, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConElem//K2-DirectConElem-4, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-40, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConElem//K2-DirectConElem-41, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConElem//K2-DirectConElem-42, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem//K2-DirectConElem-43, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem//K2-DirectConElem-44, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-45, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-46, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem//K2-DirectConElem-47, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/DirectConElem//K2-DirectConElem-48, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-49, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-50, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-51, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem//K2-DirectConElem-52, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-53, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-54, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-6, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-7, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-8, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-9, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//DirectConElemAttr-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemAttr//DirectConElemAttr-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-1, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-2, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-4, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-5, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-8, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-9, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-10, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-11, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-12, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -280,7 +234,6 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-16, EXPECTED_ERR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-17, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-18, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-19, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-2, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-20, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-21, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-22, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -291,7 +244,6 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-26, EXPECTED_ERR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-27, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-28, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-29, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-3, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-30, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-31, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-32, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -302,7 +254,6 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-36, EXPECTED_RES
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-37, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-38, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-39, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-4, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-40, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-41, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-42, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -313,7 +264,6 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-46, EXPECTED_RES
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-47, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-48, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-49, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-5, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-50, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-51, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-52, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -324,7 +274,6 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-56, EXPECTED_ERR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-57, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-58, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-59, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-6, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-60, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-61, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-62, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -335,7 +284,6 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-66, EXPECTED_ERR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-67, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-68, EXPECTED_ERROR_GOT_RESULT
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-69, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-7, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-70, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-71, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-72, EXPECTED_RESULT_GOT_ERROR
@@ -343,9 +291,15 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-73, EXPECTED_RES
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-74, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-75, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-76, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-8, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-9, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-1, EXPECTED_ERROR_GOT_FAILURE
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-2, EXPECTED_ERROR_GOT_FAILURE
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-3, EXPECTED_ERROR_GOT_FAILURE
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-4, EXPECTED_ERROR_GOT_FAILURE
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-5, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-6, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-7, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-8, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-12, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -356,7 +310,6 @@ Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-16, EXPECT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-17, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-18, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-19, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-2, EXPECTED_ERROR_GOT_FAILURE
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-20, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-21, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-22, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -367,7 +320,6 @@ Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-26, EXPECT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-27, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-28, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-29, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-3, EXPECTED_ERROR_GOT_FAILURE
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-30, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-31, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-32, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -378,7 +330,6 @@ Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-36, EXPECT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-37, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-38, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-39, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-4, EXPECTED_ERROR_GOT_FAILURE
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-40, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-41, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-42, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -388,16 +339,19 @@ Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-45, EXPECT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-46, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-47, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-48, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-6, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-8, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//DirectConElemNamespace-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/DirectConElem/DirectConElemNamespace//DirectConElemNamespace-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/DirectConElem/DirectConElemNamespace//DirectConElemNamespace-5, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemNamespace//DirectConElemNamespace-6, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-1, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-2, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-4, EXPECTED_ERROR_GOT_FAILURE
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-5, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-6, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-8, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-9, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-10, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-11, EXPECTED_ERROR_GOT_FAILURE
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-12, EXPECTED_ERROR_GOT_FAILURE
@@ -408,7 +362,6 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-16, EX
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-17, EXPECTED_ERROR_GOT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-18, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-19, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-2, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-20, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-21, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-22, EXPECTED_RESULT_GOT_ERROR
@@ -419,7 +372,6 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-26, EX
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-27, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-28, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-29, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-3, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-30, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-31, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-32, EXPECTED_RESULT_GOT_ERROR
@@ -430,7 +382,6 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-36, EX
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-37, EXPECTED_ERROR_GOT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-38, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-39, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-4, EXPECTED_ERROR_GOT_FAILURE
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-40, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-41, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-42, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -441,7 +392,6 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-46, EX
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-47, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-48, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-49, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-5, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-50, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-51, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-52, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -452,7 +402,6 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-56, EX
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-57, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-58, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-59, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-6, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-61, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-62, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-63, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -461,7 +410,6 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-65, EX
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-67, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-68, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-69, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-7, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-70, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-71, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-72, EXPECTED_ERROR_GOT_RESULT
@@ -472,9 +420,15 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-76, EX
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-77, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-78, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-79, EXPECTED_ERROR_GOT_FAILURE
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-8, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-9, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-3, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-4, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-7, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-8, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-9, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-10, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-11, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-12, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -485,7 +439,6 @@ Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-16,
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-18, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-19, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-20, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-21, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-22, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -493,14 +446,69 @@ Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-23,
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-24, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-25, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-26, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-8, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-9, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-2, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-4, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-8, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-9, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-10, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/DirectConElem//K2-DirectConElem-11, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-12, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-13, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-14, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-15, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-16, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-17, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-18, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-19, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-20, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-21, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-22, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-23, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-24, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-25, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-26, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-27, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-28, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-29, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem//K2-DirectConElem-30, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-31, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem//K2-DirectConElem-32, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-33, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem//K2-DirectConElem-34, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem//K2-DirectConElem-35, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConElem//K2-DirectConElem-36, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConElem//K2-DirectConElem-37, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConElem//K2-DirectConElem-38, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-39, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConElem//K2-DirectConElem-40, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConElem//K2-DirectConElem-41, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConElem//K2-DirectConElem-42, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem//K2-DirectConElem-43, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem//K2-DirectConElem-44, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-45, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-46, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem//K2-DirectConElem-47, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/DirectConElem//K2-DirectConElem-48, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-49, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-50, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-51, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem//K2-DirectConElem-52, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem//K2-DirectConElem-53, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConElem//K2-DirectConElem-54, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConOther//K2-DirectConOther-2, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConOther//K2-DirectConOther-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConOther//K2-DirectConOther-4, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConOther//K2-DirectConOther-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConOther//K2-DirectConOther-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConOther//K2-DirectConOther-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConOther//K2-DirectConOther-8, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/DirectConOther//K2-DirectConOther-9, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-10, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-11, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-12, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -511,7 +519,6 @@ Construct/DirectConOther//K2-DirectConOther-16, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-17, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-18, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-19, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConOther//K2-DirectConOther-2, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-20, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-21, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-22, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -522,7 +529,6 @@ Construct/DirectConOther//K2-DirectConOther-26, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-27, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-28, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-29, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConOther//K2-DirectConOther-3, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-30, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConOther//K2-DirectConOther-31, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConOther//K2-DirectConOther-32, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -533,7 +539,6 @@ Construct/DirectConOther//K2-DirectConOther-36, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConOther//K2-DirectConOther-37, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConOther//K2-DirectConOther-38, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConOther//K2-DirectConOther-39, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConOther//K2-DirectConOther-4, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-40, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConOther//K2-DirectConOther-41, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConOther//K2-DirectConOther-42, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -544,7 +549,6 @@ Construct/DirectConOther//K2-DirectConOther-46, EXPECTED_RESULT_GOT_DIFFERENT_RE
 Construct/DirectConOther//K2-DirectConOther-47, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConOther//K2-DirectConOther-48, EXPECTED_ERROR_GOT_RESULT
 Construct/DirectConOther//K2-DirectConOther-49, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConOther//K2-DirectConOther-5, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-50, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConOther//K2-DirectConOther-51, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConOther//K2-DirectConOther-52, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -555,7 +559,6 @@ Construct/DirectConOther//K2-DirectConOther-56, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-57, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-58, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConOther//K2-DirectConOther-59, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConOther//K2-DirectConOther-6, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-60, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConOther//K2-DirectConOther-61, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-62, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -566,11 +569,8 @@ Construct/DirectConOther//K2-DirectConOther-66, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConOther//K2-DirectConOther-67, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConOther//K2-DirectConOther-68, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConOther//K2-DirectConOther-69, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConOther//K2-DirectConOther-7, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-70, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConOther//K2-DirectConOther-71, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConOther//K2-DirectConOther-8, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConOther//K2-DirectConOther-9, EXPECTED_ERROR_GOT_SAME_ERROR
 ErrorsAndOptimization//errors-and-optimization-1, EXPECTED_RESULT_GOT_SAME_RESULT
 ErrorsAndOptimization//errors-and-optimization-2, EXPECTED_ERROR_GOT_SAME_ERROR
 ErrorsAndOptimization//errors-and-optimization-3, EXPECTED_RESULT_GOT_ERROR
@@ -600,9 +600,6 @@ Expressions/CondExpr//CondExpr020, EXPECTED_RESULT_GOT_FAILURE
 Expressions/CondExpr//CondExpr021, EXPECTED_RESULT_GOT_FAILURE
 Expressions/CondExpr//CondExpr022, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/CondExpr//K-CondExpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/CondExpr//K-CondExpr-10, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/CondExpr//K-CondExpr-11, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/CondExpr//K-CondExpr-12, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/CondExpr//K-CondExpr-2, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/CondExpr//K-CondExpr-3, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/CondExpr//K-CondExpr-4, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -611,7 +608,18 @@ Expressions/CondExpr//K-CondExpr-6, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/CondExpr//K-CondExpr-7, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/CondExpr//K-CondExpr-8, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/CondExpr//K-CondExpr-9, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/CondExpr//K-CondExpr-10, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/CondExpr//K-CondExpr-11, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/CondExpr//K-CondExpr-12, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-1, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-2, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-4, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-8, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-9, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-10, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-11, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-12, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -622,14 +630,6 @@ Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-16, EX
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-17, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-18, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-19, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-4, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-6, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-7, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-9, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-data-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-doc-1, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-enclexpr-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -676,6 +676,14 @@ Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-baseuri-1, EXPE
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-baseuri-2, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-baseuri-3, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-1, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-2, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-4, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-8, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-9, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-10, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-11, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-12, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -686,14 +694,6 @@ Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-16, EX
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-17, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-18, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-19, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-4, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-6, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-7, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-9, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-constrmod-3, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-constrmod-4, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-constrmod-7, EXPECTED_ERROR_GOT_FAILURE
@@ -717,14 +717,6 @@ Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-5, EXPEC
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-parent-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-string-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-1, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-10, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-11, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-12, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-13, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-15, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-16, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-18, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-19, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-2, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-3, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-4, EXPECTED_ERROR_GOT_FAILURE
@@ -733,6 +725,14 @@ Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-6, EXPECTE
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-7, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-8, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-9, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-10, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-11, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-12, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-13, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-15, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-16, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-18, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-19, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-data-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-doc-1, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-empty-1, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -745,12 +745,12 @@ Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-enclexpr-5, EXPECTE
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-invalid-1, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-invalid-2, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-invalid-3, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-name-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-name-2, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-namexml-1, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-namexml-2, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-namexml-3, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-namexml-4, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-name-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-name-2, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-parent-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -804,6 +804,14 @@ Expressions/Construct/ComputeCon/ConText//Constr-text-nested-3, EXPECTED_RESULT_
 Expressions/Construct/ComputeCon/ConText//Constr-text-parent-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConText//Constr-text-string-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ConInScopeNamespace//Constr-inscope-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-2, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-5, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-6, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-9, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ConInScopeNamespace//Constr-inscope-10, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ConInScopeNamespace//Constr-inscope-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ConInScopeNamespace//Constr-inscope-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -814,28 +822,7 @@ Expressions/Construct/ConInScopeNamespace//Constr-inscope-16, EXPECTED_RESULT_GO
 Expressions/Construct/ConInScopeNamespace//Constr-inscope-17, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ConInScopeNamespace//Constr-inscope-18, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ConInScopeNamespace//Constr-inscope-19, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-2, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ConInScopeNamespace//Constr-inscope-20, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-4, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-5, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-6, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-9, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem//Constr-elem-curlybr-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-curlybr-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-curlybr-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-curlybr-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-curlybr-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/DirectConElem//Constr-elem-curlybr-6, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/DirectConElem//Constr-elem-empty-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-empty-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-empty-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-empty-4, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-empty-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-matchtag-1, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/DirectConElem//Constr-elem-matchtag-2, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-charref-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-content-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-content-2, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -860,13 +847,12 @@ Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-id-1, EXPECTE
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-id-2, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsdecl-1, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsdecl-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nspre-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nspre-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsprein-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsprein-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nspre-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nspre-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-parent-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-10, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-2, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-3, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -875,6 +861,7 @@ Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-6, EXP
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-7, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-8, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-9, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-10, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-ws-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-ws-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-ws-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -908,12 +895,12 @@ Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-constrmod-
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-constrmod-7, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-constrmod-8, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-data-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-doc-1, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-2, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-3, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-4, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-5, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-doc-1, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-enclexpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-enclexpr-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-enclexpr-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -943,8 +930,6 @@ Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-3,
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-4, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-5, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-10, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-11, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-2, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-3, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-4, EXPECTED_RESULT_GOT_FAILURE
@@ -953,12 +938,22 @@ Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-6,
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-7, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-8, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-9, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-10, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-11, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-parent-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-string-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-text-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-text-2, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-uripres-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-1, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-3, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-4, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-5, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-6, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-7, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -969,7 +964,6 @@ Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-16,
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-18, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-19, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-20, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-21, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-22, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -979,13 +973,6 @@ Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-25,
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-26, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-27, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-29, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-4, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-5, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-6, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-7, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-adjcdata-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-adjcdata-2, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-adjcdata-3, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -993,6 +980,14 @@ Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-adjchref-
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-adjchref-2, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-adjchref-3, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -1003,19 +998,11 @@ Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-17, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-18, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-19, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-20, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-21, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-22, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-23, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-24, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-gencdata-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-gencdata-3, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-genchref-1, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -1032,7 +1019,6 @@ Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-nobound-4
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-nobound-5, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-nobound-6, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -1041,8 +1027,22 @@ Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-6, EX
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-7, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-8, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-9, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-xmlspace-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-xmlspace-2, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-curlybr-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-curlybr-2, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-curlybr-3, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-curlybr-4, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-curlybr-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/DirectConElem//Constr-elem-curlybr-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/DirectConElem//Constr-elem-empty-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-empty-2, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-empty-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-empty-4, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-empty-5, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-matchtag-1, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/DirectConElem//Constr-elem-matchtag-2, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/DirectConOther//Constr-comment-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConOther//Constr-comment-2, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConOther//Constr-comment-3, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -1064,6 +1064,14 @@ Expressions/Construct/DirectConOther//Constr-pi-target-2, EXPECTED_ERROR_GOT_SAM
 Expressions/Construct/DirectConOther//Constr-pi-target-3, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/DirectConOther//Constr-pi-target-4, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-2, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-3, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-5, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-6, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-7, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-8, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-9, EXPECTED_RESULT_GOT_FAILURE
 Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-10, EXPECTED_RESULT_GOT_FAILURE
 Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-11, EXPECTED_RESULT_GOT_FAILURE
 Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-12, EXPECTED_RESULT_GOT_FAILURE
@@ -1074,20 +1082,20 @@ Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-16, EXPECTED_RE
 Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-17, EXPECTED_RESULT_GOT_FAILURE
 Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-18, EXPECTED_RESULT_GOT_FAILURE
 Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-19, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-2, EXPECTED_RESULT_GOT_FAILURE
 Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-20, EXPECTED_RESULT_GOT_FAILURE
 Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-21, EXPECTED_RESULT_GOT_FAILURE
 Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-22, EXPECTED_RESULT_GOT_FAILURE
 Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-23, EXPECTED_ERROR_GOT_FAILURE
 Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-24, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-4, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-5, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-6, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-7, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/ContextExpr/ExternalContextExpr//externalcontextitem-9, EXPECTED_RESULT_GOT_FAILURE
 Expressions/ContextExpr/InternalContextExpr//internalcontextitem-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/ContextExpr

<TRUNCATED>

[4/4] vxquery git commit: Switched the xqts fiel to use version sort order. Easier to read.

Posted by pr...@apache.org.
Switched the xqts fiel to use version sort order. Easier to read.


Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/43852a54
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/43852a54
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/43852a54

Branch: refs/heads/master
Commit: 43852a5476ccb33bf9ee58e27468b400cc169d6a
Parents: bf8ab73
Author: Preston Carman <pr...@apache.org>
Authored: Fri Mar 4 11:10:03 2016 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Fri Mar 4 11:10:03 2016 -0800

----------------------------------------------------------------------
 .../apt/development_update_xqts_results.apt     |     4 +-
 src/site/apt/user_running_tests.apt             |    22 +-
 .../compiler/rewriter/RewriteRuleset.java       |    10 +-
 vxquery-xtest/results/xqts.txt                  | 13440 ++++++++---------
 4 files changed, 6739 insertions(+), 6737 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/vxquery/blob/43852a54/src/site/apt/development_update_xqts_results.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_update_xqts_results.apt b/src/site/apt/development_update_xqts_results.apt
index 115a178..50b36d8 100644
--- a/src/site/apt/development_update_xqts_results.apt
+++ b/src/site/apt/development_update_xqts_results.apt
@@ -15,7 +15,7 @@
 
 Update the XQTS Results
 
-  VXQuery stores the latest XQTS result for the last release. 
+  VXQuery stores the latest XQTS result for the last release.
   The file can be used to verify that all the previous test still passing.
   The following instructions show how to update the XQTS results file.
 
@@ -45,7 +45,7 @@ sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-sui
   * Sort the results so they can be compared with previous results.
 
 ----------------------------------------
-sort vxquery-xtest/results/xqts_temp.txt --output=vxquery-xtest/results/xqts.txt
+sort -V vxquery-xtest/results/xqts_temp.txt --output=vxquery-xtest/results/xqts.txt
 ----------------------------------------
 
   * Clean up (remove) the temporary results files.

http://git-wip-us.apache.org/repos/asf/vxquery/blob/43852a54/src/site/apt/user_running_tests.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_running_tests.apt b/src/site/apt/user_running_tests.apt
index d5e97b2..c117785 100644
--- a/src/site/apt/user_running_tests.apt
+++ b/src/site/apt/user_running_tests.apt
@@ -45,7 +45,7 @@ xtest.bat
  -v              : Verbose
  -xmlreport VAL  : XML Report output file
 ----------------------------------------
- 
+
 * Java Options
 
   The command can be run with Java options to increase the amount of memory to one gigabyte.
@@ -55,30 +55,30 @@ xtest.bat
 ----------------------------------------
 JAVA_OPTS="-Xmx1024m -Djava.util.logging.config.file=/path/to/logging.properties"
 ----------------------------------------
- 
+
 * VXQuery Testing Options
 
   * VXQuery Test Suite
 
     The VXQuery test suite focuses on parallel processing tests used in our weather benchmark.
-  
+
 ----------------------------------------
 sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/src/test/resources/VXQueryCatalog.xml -htmlreport /tmp/vxquery_report.html
 ----------------------------------------
 
     * view the results at {{{file:///tmp/vxquery_report.html}file:///tmp/vxquery_report.html}}.
-  
+
   * XQTS (XQuery Test Suite)
     To run the complete XQTS on VXQuery.
-  
-    * Create a folder to hold the XQTS. 
+
+    * Create a folder to hold the XQTS.
       If you use "vxquery-xtest/test-suites/xqts", then maven will utilize the XQTS to verify VXQuery's passing functions during the build process.
-    
+
 ----------------------------------------
 $ mkdir -p vxquery-xtest/test-suites
 $ cd vxquery-xtest/test-suites
 ----------------------------------------
-    
+
     * Get the archive {{{http://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/XQTS_1_0_3.zip}XQTS_1_0_3.zip}} (e.g. using wget),
 
 ----------------------------------------
@@ -88,10 +88,7 @@ $ wget http://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/XQTS_1_0_
     * unpack it,
 
 ----------------------------------------
-$ mkdir xqts
-$ cd xqts
-$ unzip ../XQTS_1_0_3.zip
-$ cd ..
+$ unzip -d xqts XQTS_1_0_3.zip
 ----------------------------------------
 
     * go back to the project root,
@@ -123,4 +120,3 @@ sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-sui
 
     * view the results at {{{file:///tmp/previous_report.html}file:///tmp/previous_report.html}}.
 
-  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/43852a54/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
index 6f09543..fd20465 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
@@ -90,6 +90,7 @@ import org.apache.hyracks.algebricks.rewriter.rules.SubplanOutOfGroupRule;
 public class RewriteRuleset {
     /**
      * Optimizations specific to XQuery.
+     *
      * @return List of algebraic rewrite rules.
      */
     public final static List<IAlgebraicRewriteRule> buildPathStepNormalizationRuleCollection() {
@@ -147,6 +148,7 @@ public class RewriteRuleset {
 
     /**
      * Optimizations specific to XQuery.
+     *
      * @return List of algebraic rewrite rules.
      */
     public final static List<IAlgebraicRewriteRule> buildXQueryNormalizationRuleCollection() {
@@ -172,6 +174,7 @@ public class RewriteRuleset {
 
     /**
      * Remove expressions known to be redundant.
+     *
      * @return List of algebraic rewrite rules.
      */
     public final static List<IAlgebraicRewriteRule> buildInlineRedundantExpressionNormalizationRuleCollection() {
@@ -191,6 +194,7 @@ public class RewriteRuleset {
 
     /**
      * When a nested data sources exist, convert the plan to use the join operator.
+     *
      * @return List of algebraic rewrite rules.
      */
     public final static List<IAlgebraicRewriteRule> buildNestedDataSourceRuleCollection() {
@@ -215,6 +219,7 @@ public class RewriteRuleset {
 
     /**
      * Unnest more complex structures.
+     *
      * @return List of algebraic rewrite rules.
      */
     public final static List<IAlgebraicRewriteRule> buildUnnestingRuleCollection() {
@@ -306,6 +311,7 @@ public class RewriteRuleset {
         physicalPlanRewrites.add(new PullSelectOutOfEqJoin());
         physicalPlanRewrites.add(new PushFunctionsOntoEqJoinBranches());
         physicalPlanRewrites.add(new SetAlgebricksPhysicalOperatorsRule());
+        physicalPlanRewrites.add(new SetExecutionModeRule());
         physicalPlanRewrites.add(new EnforceStructuralPropertiesRule());
         physicalPlanRewrites.add(new PushProjectDownRule());
         physicalPlanRewrites.add(new CopyLimitDownRule());
@@ -322,8 +328,8 @@ public class RewriteRuleset {
     public final static List<IAlgebraicRewriteRule> prepareForJobGenRuleCollection() {
         List<IAlgebraicRewriteRule> prepareForJobGenRewrites = new LinkedList<IAlgebraicRewriteRule>();
         prepareForJobGenRewrites.add(new ConvertFromAlgebricksExpressionsRule());
-        prepareForJobGenRewrites.add(new IsolateHyracksOperatorsRule(
-                HeuristicOptimizer.hyraxOperatorsBelowWhichJobGenIsDisabled));
+        prepareForJobGenRewrites
+                .add(new IsolateHyracksOperatorsRule(HeuristicOptimizer.hyraxOperatorsBelowWhichJobGenIsDisabled));
         prepareForJobGenRewrites.add(new ExtractCommonOperatorsRule());
         // Re-infer all types, so that, e.g., the effect of not-is-null is
         // propagated.