diff --git a/TestCases/DMN15.xsd b/TestCases/DMN15.xsd
new file mode 100644
index 000000000..a6b161ecb
--- /dev/null
+++ b/TestCases/DMN15.xsd
@@ -0,0 +1,592 @@
+
+
+
+
+
+
+ Include the DMN Diagram Interchange (DI) schema
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TestCases/DMNDI15.xsd b/TestCases/DMNDI15.xsd
new file mode 100644
index 000000000..17b553534
--- /dev/null
+++ b/TestCases/DMNDI15.xsd
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+ This element should never be instantiated directly, but rather concrete implementation should. It is placed there only to be referred in the sequence
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TestCases/compliance-level-2/0001-input-data-string/0001-input-data-string.dmn b/TestCases/compliance-level-2/0001-input-data-string/0001-input-data-string.dmn
index 3ee37abbe..a52940fba 100644
--- a/TestCases/compliance-level-2/0001-input-data-string/0001-input-data-string.dmn
+++ b/TestCases/compliance-level-2/0001-input-data-string/0001-input-data-string.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0002-input-data-number/0002-input-data-number.dmn b/TestCases/compliance-level-2/0002-input-data-number/0002-input-data-number.dmn
index ec5b93fb1..e48f06d56 100644
--- a/TestCases/compliance-level-2/0002-input-data-number/0002-input-data-number.dmn
+++ b/TestCases/compliance-level-2/0002-input-data-number/0002-input-data-number.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0003-input-data-string-allowed-values/0003-input-data-string-allowed-values.dmn b/TestCases/compliance-level-2/0003-input-data-string-allowed-values/0003-input-data-string-allowed-values.dmn
index b6d1e4612..da8d871b8 100644
--- a/TestCases/compliance-level-2/0003-input-data-string-allowed-values/0003-input-data-string-allowed-values.dmn
+++ b/TestCases/compliance-level-2/0003-input-data-string-allowed-values/0003-input-data-string-allowed-values.dmn
@@ -1,5 +1,5 @@
-
+
string
diff --git a/TestCases/compliance-level-2/0004-simpletable-U/0004-simpletable-U.dmn b/TestCases/compliance-level-2/0004-simpletable-U/0004-simpletable-U.dmn
index 35a93db1d..2ff5c6f77 100644
--- a/TestCases/compliance-level-2/0004-simpletable-U/0004-simpletable-U.dmn
+++ b/TestCases/compliance-level-2/0004-simpletable-U/0004-simpletable-U.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0005-simpletable-A/0005-simpletable-A.dmn b/TestCases/compliance-level-2/0005-simpletable-A/0005-simpletable-A.dmn
index 93d3146de..94568b8f2 100644
--- a/TestCases/compliance-level-2/0005-simpletable-A/0005-simpletable-A.dmn
+++ b/TestCases/compliance-level-2/0005-simpletable-A/0005-simpletable-A.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0006-simpletable-P1/0006-simpletable-P1.dmn b/TestCases/compliance-level-2/0006-simpletable-P1/0006-simpletable-P1.dmn
index 03d84f39d..5c654e04a 100644
--- a/TestCases/compliance-level-2/0006-simpletable-P1/0006-simpletable-P1.dmn
+++ b/TestCases/compliance-level-2/0006-simpletable-P1/0006-simpletable-P1.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0007-simpletable-P2/0007-simpletable-P2.dmn b/TestCases/compliance-level-2/0007-simpletable-P2/0007-simpletable-P2.dmn
index 027bebd88..c16063c7c 100644
--- a/TestCases/compliance-level-2/0007-simpletable-P2/0007-simpletable-P2.dmn
+++ b/TestCases/compliance-level-2/0007-simpletable-P2/0007-simpletable-P2.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0008-LX-arithmetic/0008-LX-arithmetic.dmn b/TestCases/compliance-level-2/0008-LX-arithmetic/0008-LX-arithmetic.dmn
index b9c70f65e..68c042995 100644
--- a/TestCases/compliance-level-2/0008-LX-arithmetic/0008-LX-arithmetic.dmn
+++ b/TestCases/compliance-level-2/0008-LX-arithmetic/0008-LX-arithmetic.dmn
@@ -1,5 +1,5 @@
-
+
number
diff --git a/TestCases/compliance-level-2/0009-invocation-arithmetic/0009-invocation-arithmetic.dmn b/TestCases/compliance-level-2/0009-invocation-arithmetic/0009-invocation-arithmetic.dmn
index c37762ee9..b128ac2d7 100644
--- a/TestCases/compliance-level-2/0009-invocation-arithmetic/0009-invocation-arithmetic.dmn
+++ b/TestCases/compliance-level-2/0009-invocation-arithmetic/0009-invocation-arithmetic.dmn
@@ -1,5 +1,5 @@
-
+
number
@@ -32,7 +32,7 @@
-
+
(p*r/12)/(1-(1+r/12)**-n)
diff --git a/TestCases/compliance-level-2/0010-multi-output-U/0010-multi-output-U.dmn b/TestCases/compliance-level-2/0010-multi-output-U/0010-multi-output-U.dmn
index dfaa15b3d..91e8ed68a 100644
--- a/TestCases/compliance-level-2/0010-multi-output-U/0010-multi-output-U.dmn
+++ b/TestCases/compliance-level-2/0010-multi-output-U/0010-multi-output-U.dmn
@@ -1,5 +1,5 @@
-
+
string
diff --git a/TestCases/compliance-level-2/0100-feel-constants/0100-feel-constants.dmn b/TestCases/compliance-level-2/0100-feel-constants/0100-feel-constants.dmn
index a342e338c..02cc92d50 100644
--- a/TestCases/compliance-level-2/0100-feel-constants/0100-feel-constants.dmn
+++ b/TestCases/compliance-level-2/0100-feel-constants/0100-feel-constants.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0101-feel-constants/0101-feel-constants.dmn b/TestCases/compliance-level-2/0101-feel-constants/0101-feel-constants.dmn
index 03b7d854d..d8f220487 100644
--- a/TestCases/compliance-level-2/0101-feel-constants/0101-feel-constants.dmn
+++ b/TestCases/compliance-level-2/0101-feel-constants/0101-feel-constants.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0102-feel-constants/0102-feel-constants.dmn b/TestCases/compliance-level-2/0102-feel-constants/0102-feel-constants.dmn
index c352d41d4..477d57e44 100644
--- a/TestCases/compliance-level-2/0102-feel-constants/0102-feel-constants.dmn
+++ b/TestCases/compliance-level-2/0102-feel-constants/0102-feel-constants.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0105-feel-math/0105-feel-math.dmn b/TestCases/compliance-level-2/0105-feel-math/0105-feel-math.dmn
index 366c527b4..ddffa1a41 100644
--- a/TestCases/compliance-level-2/0105-feel-math/0105-feel-math.dmn
+++ b/TestCases/compliance-level-2/0105-feel-math/0105-feel-math.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0106-feel-ternary-logic/0106-feel-ternary-logic.dmn b/TestCases/compliance-level-2/0106-feel-ternary-logic/0106-feel-ternary-logic.dmn
index 46f39c713..ab955761e 100644
--- a/TestCases/compliance-level-2/0106-feel-ternary-logic/0106-feel-ternary-logic.dmn
+++ b/TestCases/compliance-level-2/0106-feel-ternary-logic/0106-feel-ternary-logic.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0107-feel-ternary-logic-not/0107-feel-ternary-logic-not.dmn b/TestCases/compliance-level-2/0107-feel-ternary-logic-not/0107-feel-ternary-logic-not.dmn
index 39c16a9f3..a10647e7b 100644
--- a/TestCases/compliance-level-2/0107-feel-ternary-logic-not/0107-feel-ternary-logic-not.dmn
+++ b/TestCases/compliance-level-2/0107-feel-ternary-logic-not/0107-feel-ternary-logic-not.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0108-first-hitpolicy/0108-first-hitpolicy.dmn b/TestCases/compliance-level-2/0108-first-hitpolicy/0108-first-hitpolicy.dmn
index 331180c24..7b23dc0c8 100644
--- a/TestCases/compliance-level-2/0108-first-hitpolicy/0108-first-hitpolicy.dmn
+++ b/TestCases/compliance-level-2/0108-first-hitpolicy/0108-first-hitpolicy.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0109-ruleOrder-hitpolicy/0109-ruleOrder-hitpolicy.dmn b/TestCases/compliance-level-2/0109-ruleOrder-hitpolicy/0109-ruleOrder-hitpolicy.dmn
index 361231396..0be4dee47 100644
--- a/TestCases/compliance-level-2/0109-ruleOrder-hitpolicy/0109-ruleOrder-hitpolicy.dmn
+++ b/TestCases/compliance-level-2/0109-ruleOrder-hitpolicy/0109-ruleOrder-hitpolicy.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0110-outputOrder-hitpolicy/0110-outputOrder-hitpolicy.dmn b/TestCases/compliance-level-2/0110-outputOrder-hitpolicy/0110-outputOrder-hitpolicy.dmn
index 551270372..0eb41104c 100644
--- a/TestCases/compliance-level-2/0110-outputOrder-hitpolicy/0110-outputOrder-hitpolicy.dmn
+++ b/TestCases/compliance-level-2/0110-outputOrder-hitpolicy/0110-outputOrder-hitpolicy.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0111-first-hitpolicy-singleoutputcol/0111-first-hitpolicy-singleoutputcol.dmn b/TestCases/compliance-level-2/0111-first-hitpolicy-singleoutputcol/0111-first-hitpolicy-singleoutputcol.dmn
index 4fd8c9260..4eeab784c 100644
--- a/TestCases/compliance-level-2/0111-first-hitpolicy-singleoutputcol/0111-first-hitpolicy-singleoutputcol.dmn
+++ b/TestCases/compliance-level-2/0111-first-hitpolicy-singleoutputcol/0111-first-hitpolicy-singleoutputcol.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0112-ruleOrder-hitpolicy-singleinoutcol/0112-ruleOrder-hitpolicy-singleinoutcol.dmn b/TestCases/compliance-level-2/0112-ruleOrder-hitpolicy-singleinoutcol/0112-ruleOrder-hitpolicy-singleinoutcol.dmn
index a602007dc..28fac842b 100644
--- a/TestCases/compliance-level-2/0112-ruleOrder-hitpolicy-singleinoutcol/0112-ruleOrder-hitpolicy-singleinoutcol.dmn
+++ b/TestCases/compliance-level-2/0112-ruleOrder-hitpolicy-singleinoutcol/0112-ruleOrder-hitpolicy-singleinoutcol.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0113-outputOrder-hitpolicy-singleinoutcol/0113-outputOrder-hitpolicy-singleinoutcol.dmn b/TestCases/compliance-level-2/0113-outputOrder-hitpolicy-singleinoutcol/0113-outputOrder-hitpolicy-singleinoutcol.dmn
index 13161348b..ad603cf90 100644
--- a/TestCases/compliance-level-2/0113-outputOrder-hitpolicy-singleinoutcol/0113-outputOrder-hitpolicy-singleinoutcol.dmn
+++ b/TestCases/compliance-level-2/0113-outputOrder-hitpolicy-singleinoutcol/0113-outputOrder-hitpolicy-singleinoutcol.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0114-min-collect-hitpolicy/0114-min-collect-hitpolicy.dmn b/TestCases/compliance-level-2/0114-min-collect-hitpolicy/0114-min-collect-hitpolicy.dmn
index 83db1be8a..d4b8da32d 100644
--- a/TestCases/compliance-level-2/0114-min-collect-hitpolicy/0114-min-collect-hitpolicy.dmn
+++ b/TestCases/compliance-level-2/0114-min-collect-hitpolicy/0114-min-collect-hitpolicy.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0115-sum-collect-hitpolicy/0115-sum-collect-hitpolicy.dmn b/TestCases/compliance-level-2/0115-sum-collect-hitpolicy/0115-sum-collect-hitpolicy.dmn
index c76bf7ab8..ac0a3033b 100644
--- a/TestCases/compliance-level-2/0115-sum-collect-hitpolicy/0115-sum-collect-hitpolicy.dmn
+++ b/TestCases/compliance-level-2/0115-sum-collect-hitpolicy/0115-sum-collect-hitpolicy.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0116-count-collect-hitpolicy/0116-count-collect-hitpolicy.dmn b/TestCases/compliance-level-2/0116-count-collect-hitpolicy/0116-count-collect-hitpolicy.dmn
index ec2b5dcef..9d583b331 100644
--- a/TestCases/compliance-level-2/0116-count-collect-hitpolicy/0116-count-collect-hitpolicy.dmn
+++ b/TestCases/compliance-level-2/0116-count-collect-hitpolicy/0116-count-collect-hitpolicy.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0117-multi-any-hitpolicy/0117-multi-any-hitpolicy.dmn b/TestCases/compliance-level-2/0117-multi-any-hitpolicy/0117-multi-any-hitpolicy.dmn
index 2e034dbc5..5f31942e0 100644
--- a/TestCases/compliance-level-2/0117-multi-any-hitpolicy/0117-multi-any-hitpolicy.dmn
+++ b/TestCases/compliance-level-2/0117-multi-any-hitpolicy/0117-multi-any-hitpolicy.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0118-multi-priority-hitpolicy/0118-multi-priority-hitpolicy.dmn b/TestCases/compliance-level-2/0118-multi-priority-hitpolicy/0118-multi-priority-hitpolicy.dmn
index f919aa55f..80ef303c3 100644
--- a/TestCases/compliance-level-2/0118-multi-priority-hitpolicy/0118-multi-priority-hitpolicy.dmn
+++ b/TestCases/compliance-level-2/0118-multi-priority-hitpolicy/0118-multi-priority-hitpolicy.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/0119-multi-collect-hitpolicy/0119-multi-collect-hitpolicy.dmn b/TestCases/compliance-level-2/0119-multi-collect-hitpolicy/0119-multi-collect-hitpolicy.dmn
index a01830c98..8de3b880f 100644
--- a/TestCases/compliance-level-2/0119-multi-collect-hitpolicy/0119-multi-collect-hitpolicy.dmn
+++ b/TestCases/compliance-level-2/0119-multi-collect-hitpolicy/0119-multi-collect-hitpolicy.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-2/labeler.xslt b/TestCases/compliance-level-2/labeler.xslt
index d39fb9746..5ff44389c 100644
--- a/TestCases/compliance-level-2/labeler.xslt
+++ b/TestCases/compliance-level-2/labeler.xslt
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-3/0001-filter/0001-filter.dmn b/TestCases/compliance-level-3/0001-filter/0001-filter.dmn
index 7796974c6..908ae05e8 100644
--- a/TestCases/compliance-level-3/0001-filter/0001-filter.dmn
+++ b/TestCases/compliance-level-3/0001-filter/0001-filter.dmn
@@ -1,5 +1,5 @@
-
+
number
diff --git a/TestCases/compliance-level-3/0002-string-functions/0002-string-functions.dmn b/TestCases/compliance-level-3/0002-string-functions/0002-string-functions.dmn
index f58a53fba..820211c41 100644
--- a/TestCases/compliance-level-3/0002-string-functions/0002-string-functions.dmn
+++ b/TestCases/compliance-level-3/0002-string-functions/0002-string-functions.dmn
@@ -1,5 +1,5 @@
-
+
boolean
diff --git a/TestCases/compliance-level-3/0003-iteration/0003-iteration.dmn b/TestCases/compliance-level-3/0003-iteration/0003-iteration.dmn
index c646e20f2..31fc60e28 100644
--- a/TestCases/compliance-level-3/0003-iteration/0003-iteration.dmn
+++ b/TestCases/compliance-level-3/0003-iteration/0003-iteration.dmn
@@ -1,5 +1,5 @@
-
+
number
diff --git a/TestCases/compliance-level-3/0004-lending/0004-lending.dmn b/TestCases/compliance-level-3/0004-lending/0004-lending.dmn
index 887e941ae..a1204d9eb 100644
--- a/TestCases/compliance-level-3/0004-lending/0004-lending.dmn
+++ b/TestCases/compliance-level-3/0004-lending/0004-lending.dmn
@@ -1,5 +1,5 @@
-
+
string
diff --git a/TestCases/compliance-level-3/0005-literal-invocation/0005-literal-invocation.dmn b/TestCases/compliance-level-3/0005-literal-invocation/0005-literal-invocation.dmn
index bfaa10da6..8c9ea9484 100644
--- a/TestCases/compliance-level-3/0005-literal-invocation/0005-literal-invocation.dmn
+++ b/TestCases/compliance-level-3/0005-literal-invocation/0005-literal-invocation.dmn
@@ -1,5 +1,5 @@
-
+
number
diff --git a/TestCases/compliance-level-3/0006-join/0006-join.dmn b/TestCases/compliance-level-3/0006-join/0006-join.dmn
index a4aa07885..464b19566 100644
--- a/TestCases/compliance-level-3/0006-join/0006-join.dmn
+++ b/TestCases/compliance-level-3/0006-join/0006-join.dmn
@@ -1,5 +1,5 @@
-
+
string
diff --git a/TestCases/compliance-level-3/0007-date-time/0007-date-time.dmn b/TestCases/compliance-level-3/0007-date-time/0007-date-time.dmn
index d07820099..5e9dbd56f 100644
--- a/TestCases/compliance-level-3/0007-date-time/0007-date-time.dmn
+++ b/TestCases/compliance-level-3/0007-date-time/0007-date-time.dmn
@@ -1,5 +1,5 @@
-
+
number
diff --git a/TestCases/compliance-level-3/0008-listGen/0008-listGen.dmn b/TestCases/compliance-level-3/0008-listGen/0008-listGen.dmn
index f4d3d3dfb..8a558a28c 100644
--- a/TestCases/compliance-level-3/0008-listGen/0008-listGen.dmn
+++ b/TestCases/compliance-level-3/0008-listGen/0008-listGen.dmn
@@ -1,5 +1,5 @@
-
+
string
diff --git a/TestCases/compliance-level-3/0009-append-flatten/0009-append-flatten.dmn b/TestCases/compliance-level-3/0009-append-flatten/0009-append-flatten.dmn
index aa197ee41..05311b30a 100644
--- a/TestCases/compliance-level-3/0009-append-flatten/0009-append-flatten.dmn
+++ b/TestCases/compliance-level-3/0009-append-flatten/0009-append-flatten.dmn
@@ -1,5 +1,5 @@
-
+
string
diff --git a/TestCases/compliance-level-3/0010-concatenate/0010-concatenate.dmn b/TestCases/compliance-level-3/0010-concatenate/0010-concatenate.dmn
index 7e337d22b..5fa00c217 100644
--- a/TestCases/compliance-level-3/0010-concatenate/0010-concatenate.dmn
+++ b/TestCases/compliance-level-3/0010-concatenate/0010-concatenate.dmn
@@ -1,5 +1,5 @@
-
+
string
diff --git a/TestCases/compliance-level-3/0011-insert-remove/0011-insert-remove.dmn b/TestCases/compliance-level-3/0011-insert-remove/0011-insert-remove.dmn
index 65062675d..0114087eb 100644
--- a/TestCases/compliance-level-3/0011-insert-remove/0011-insert-remove.dmn
+++ b/TestCases/compliance-level-3/0011-insert-remove/0011-insert-remove.dmn
@@ -1,5 +1,5 @@
-
+
string
diff --git a/TestCases/compliance-level-3/0012-list-functions/0012-list-functions.dmn b/TestCases/compliance-level-3/0012-list-functions/0012-list-functions.dmn
index 46190eef2..5c2d794bf 100644
--- a/TestCases/compliance-level-3/0012-list-functions/0012-list-functions.dmn
+++ b/TestCases/compliance-level-3/0012-list-functions/0012-list-functions.dmn
@@ -1,5 +1,5 @@
-
+
string
diff --git a/TestCases/compliance-level-3/0013-sort/0013-sort.dmn b/TestCases/compliance-level-3/0013-sort/0013-sort.dmn
index dbdaeedb6..971dfd2d6 100644
--- a/TestCases/compliance-level-3/0013-sort/0013-sort.dmn
+++ b/TestCases/compliance-level-3/0013-sort/0013-sort.dmn
@@ -1,5 +1,5 @@
-
+
number
diff --git a/TestCases/compliance-level-3/0014-loan-comparison/0014-loan-comparison.dmn b/TestCases/compliance-level-3/0014-loan-comparison/0014-loan-comparison.dmn
index a3a887099..ce3d90fa9 100644
--- a/TestCases/compliance-level-3/0014-loan-comparison/0014-loan-comparison.dmn
+++ b/TestCases/compliance-level-3/0014-loan-comparison/0014-loan-comparison.dmn
@@ -1,5 +1,5 @@
-
+
string
diff --git a/TestCases/compliance-level-3/0016-some-every/0016-some-every.dmn b/TestCases/compliance-level-3/0016-some-every/0016-some-every.dmn
index 2310fb200..2b6c87716 100644
--- a/TestCases/compliance-level-3/0016-some-every/0016-some-every.dmn
+++ b/TestCases/compliance-level-3/0016-some-every/0016-some-every.dmn
@@ -1,5 +1,5 @@
-
+
string
diff --git a/TestCases/compliance-level-3/0017-tableTests/0017-tableTests.dmn b/TestCases/compliance-level-3/0017-tableTests/0017-tableTests.dmn
index f4bdb5ec3..dc12df068 100644
--- a/TestCases/compliance-level-3/0017-tableTests/0017-tableTests.dmn
+++ b/TestCases/compliance-level-3/0017-tableTests/0017-tableTests.dmn
@@ -1,5 +1,5 @@
-
+
number
diff --git a/TestCases/compliance-level-3/0020-vacation-days/0020-vacation-days.dmn b/TestCases/compliance-level-3/0020-vacation-days/0020-vacation-days.dmn
index d91a52428..b908944f5 100644
--- a/TestCases/compliance-level-3/0020-vacation-days/0020-vacation-days.dmn
+++ b/TestCases/compliance-level-3/0020-vacation-days/0020-vacation-days.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-3/0021-singleton-list/0021-singleton-list.dmn b/TestCases/compliance-level-3/0021-singleton-list/0021-singleton-list.dmn
index 71e961057..84ec08b6a 100644
--- a/TestCases/compliance-level-3/0021-singleton-list/0021-singleton-list.dmn
+++ b/TestCases/compliance-level-3/0021-singleton-list/0021-singleton-list.dmn
@@ -1,5 +1,5 @@
-
+
string
diff --git a/TestCases/compliance-level-3/0030-user-defined-functions/0030-user-defined-functions.dmn b/TestCases/compliance-level-3/0030-user-defined-functions/0030-user-defined-functions.dmn
index 7ea54667b..282a9af3f 100644
--- a/TestCases/compliance-level-3/0030-user-defined-functions/0030-user-defined-functions.dmn
+++ b/TestCases/compliance-level-3/0030-user-defined-functions/0030-user-defined-functions.dmn
@@ -1,5 +1,5 @@
-
+
Tests definition of functions in a boxed expression and invocation of those.
diff --git a/TestCases/compliance-level-3/0031-user-defined-functions/0031-user-defined-functions.dmn b/TestCases/compliance-level-3/0031-user-defined-functions/0031-user-defined-functions.dmn
index 150c9e805..6f7938171 100644
--- a/TestCases/compliance-level-3/0031-user-defined-functions/0031-user-defined-functions.dmn
+++ b/TestCases/compliance-level-3/0031-user-defined-functions/0031-user-defined-functions.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-3/0032-conditionals/0032-conditionals.dmn b/TestCases/compliance-level-3/0032-conditionals/0032-conditionals.dmn
index f59c01ea0..fe69fb745 100644
--- a/TestCases/compliance-level-3/0032-conditionals/0032-conditionals.dmn
+++ b/TestCases/compliance-level-3/0032-conditionals/0032-conditionals.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-3/0033-for-loops/0033-for-loops.dmn b/TestCases/compliance-level-3/0033-for-loops/0033-for-loops.dmn
index 63e511b2f..9b1cb56e2 100644
--- a/TestCases/compliance-level-3/0033-for-loops/0033-for-loops.dmn
+++ b/TestCases/compliance-level-3/0033-for-loops/0033-for-loops.dmn
@@ -1,5 +1,5 @@
-
+
number
diff --git a/TestCases/compliance-level-3/0034-drg-scopes/0034-drg-scopes.dmn b/TestCases/compliance-level-3/0034-drg-scopes/0034-drg-scopes.dmn
index 226b8d292..777fba7e6 100644
--- a/TestCases/compliance-level-3/0034-drg-scopes/0034-drg-scopes.dmn
+++ b/TestCases/compliance-level-3/0034-drg-scopes/0034-drg-scopes.dmn
@@ -1,5 +1,5 @@
-
+
@@ -59,91 +59,91 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/TestCases/compliance-level-3/0035-test-structure-output/0035-test-structure-output.dmn b/TestCases/compliance-level-3/0035-test-structure-output/0035-test-structure-output.dmn
index df3995dbc..961dcca4f 100644
--- a/TestCases/compliance-level-3/0035-test-structure-output/0035-test-structure-output.dmn
+++ b/TestCases/compliance-level-3/0035-test-structure-output/0035-test-structure-output.dmn
@@ -1,5 +1,5 @@
-
+
number
diff --git a/TestCases/compliance-level-3/0036-dt-variable-input/0036-dt-variable-input.dmn b/TestCases/compliance-level-3/0036-dt-variable-input/0036-dt-variable-input.dmn
index d25f0e76b..338c749bf 100644
--- a/TestCases/compliance-level-3/0036-dt-variable-input/0036-dt-variable-input.dmn
+++ b/TestCases/compliance-level-3/0036-dt-variable-input/0036-dt-variable-input.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-3/0037-dt-on-bkm-implicit-params/0037-dt-on-bkm-implicit-params.dmn b/TestCases/compliance-level-3/0037-dt-on-bkm-implicit-params/0037-dt-on-bkm-implicit-params.dmn
index 5c0f342d5..2522707e5 100644
--- a/TestCases/compliance-level-3/0037-dt-on-bkm-implicit-params/0037-dt-on-bkm-implicit-params.dmn
+++ b/TestCases/compliance-level-3/0037-dt-on-bkm-implicit-params/0037-dt-on-bkm-implicit-params.dmn
@@ -1,5 +1,5 @@
-
+
@@ -86,7 +86,7 @@
-
-
+
Person.Name + " is a dad of " + string(decimal(Person.Children,0)) + " children."
@@ -100,7 +100,7 @@
-
-
+
Person.Name + " is a mother of " + string(decimal(Person.Children,0)) + " children."
diff --git a/TestCases/compliance-level-3/0038-dt-on-bkm-explicit-params/0038-dt-on-bkm-explicit-params.dmn b/TestCases/compliance-level-3/0038-dt-on-bkm-explicit-params/0038-dt-on-bkm-explicit-params.dmn
index d7222a616..69f98c06e 100644
--- a/TestCases/compliance-level-3/0038-dt-on-bkm-explicit-params/0038-dt-on-bkm-explicit-params.dmn
+++ b/TestCases/compliance-level-3/0038-dt-on-bkm-explicit-params/0038-dt-on-bkm-explicit-params.dmn
@@ -1,5 +1,5 @@
-
+
@@ -59,7 +59,7 @@
"Male"
-
+
Person.Name + " is a dad of " + string(decimal(Person.Children,0)) + " children."
@@ -67,7 +67,7 @@
"Female"
-
+
Person.Name + " is a mother of " + string(decimal(Person.Children,0)) + " children."
diff --git a/TestCases/compliance-level-3/0039-dt-list-semantics/0039-dt-list-semantics.dmn b/TestCases/compliance-level-3/0039-dt-list-semantics/0039-dt-list-semantics.dmn
index 54bb1e22c..e6b075645 100644
--- a/TestCases/compliance-level-3/0039-dt-list-semantics/0039-dt-list-semantics.dmn
+++ b/TestCases/compliance-level-3/0039-dt-list-semantics/0039-dt-list-semantics.dmn
@@ -1,5 +1,5 @@
-
+
string
diff --git a/TestCases/compliance-level-3/0040-singlenestedcontext/0040-singlenestedcontext.dmn b/TestCases/compliance-level-3/0040-singlenestedcontext/0040-singlenestedcontext.dmn
index 87740c39b..228a09fef 100644
--- a/TestCases/compliance-level-3/0040-singlenestedcontext/0040-singlenestedcontext.dmn
+++ b/TestCases/compliance-level-3/0040-singlenestedcontext/0040-singlenestedcontext.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-3/0041-multiple-nestedcontext/0041-multiple-nestedcontext.dmn b/TestCases/compliance-level-3/0041-multiple-nestedcontext/0041-multiple-nestedcontext.dmn
index 51f88bedf..15bd54629 100644
--- a/TestCases/compliance-level-3/0041-multiple-nestedcontext/0041-multiple-nestedcontext.dmn
+++ b/TestCases/compliance-level-3/0041-multiple-nestedcontext/0041-multiple-nestedcontext.dmn
@@ -1,5 +1,5 @@
-
+
diff --git a/TestCases/compliance-level-3/0050-feel-abs-function/0050-feel-abs-function.dmn b/TestCases/compliance-level-3/0050-feel-abs-function/0050-feel-abs-function.dmn
index 7f2c16408..e05ee9681 100644
--- a/TestCases/compliance-level-3/0050-feel-abs-function/0050-feel-abs-function.dmn
+++ b/TestCases/compliance-level-3/0050-feel-abs-function/0050-feel-abs-function.dmn
@@ -1,5 +1,5 @@
-
+
FEEL built-in function 'abs(number)' in category numeric functions
Tests FEEL expression: 'abs(1)' and expects result: '1 (number)'
diff --git a/TestCases/compliance-level-3/0051-feel-sqrt-function/0051-feel-sqrt-function.dmn b/TestCases/compliance-level-3/0051-feel-sqrt-function/0051-feel-sqrt-function.dmn
index 950f85941..c25d58022 100644
--- a/TestCases/compliance-level-3/0051-feel-sqrt-function/0051-feel-sqrt-function.dmn
+++ b/TestCases/compliance-level-3/0051-feel-sqrt-function/0051-feel-sqrt-function.dmn
@@ -1,5 +1,5 @@
-
+
FEEL built-in function 'sqrt(number)' in category numeric functions
Tests FEEL expression: 'sqrt(4)' and expects result: '2 (number)'
diff --git a/TestCases/compliance-level-3/0052-feel-exp-function/0052-feel-exp-function.dmn b/TestCases/compliance-level-3/0052-feel-exp-function/0052-feel-exp-function.dmn
index c459bc51c..28f869fad 100644
--- a/TestCases/compliance-level-3/0052-feel-exp-function/0052-feel-exp-function.dmn
+++ b/TestCases/compliance-level-3/0052-feel-exp-function/0052-feel-exp-function.dmn
@@ -1,5 +1,5 @@
-
+
FEEL built-in function 'exp(number)' in category numeric functions
Tests FEEL expression: 'exp(4)' and expects result: '2 (number)'
diff --git a/TestCases/compliance-level-3/0053-feel-log-function/0053-feel-log-function.dmn b/TestCases/compliance-level-3/0053-feel-log-function/0053-feel-log-function.dmn
index af8deb975..d57ba3742 100644
--- a/TestCases/compliance-level-3/0053-feel-log-function/0053-feel-log-function.dmn
+++ b/TestCases/compliance-level-3/0053-feel-log-function/0053-feel-log-function.dmn
@@ -1,5 +1,5 @@
-
+
FEEL built-in function 'log(number)' in category numeric functions
Tests FEEL expression: 'log(4)' and expects result: '2 (number)'
diff --git a/TestCases/compliance-level-3/0054-feel-even-function/0054-feel-even-function.dmn b/TestCases/compliance-level-3/0054-feel-even-function/0054-feel-even-function.dmn
index 0047c1c84..1c9fe83bb 100644
--- a/TestCases/compliance-level-3/0054-feel-even-function/0054-feel-even-function.dmn
+++ b/TestCases/compliance-level-3/0054-feel-even-function/0054-feel-even-function.dmn
@@ -1,5 +1,5 @@
-
+
FEEL built-in function 'even(number)' in category numeric functions
Tests FEEL expression: 'even(2)' and expects result: 'true (boolean)'
diff --git a/TestCases/compliance-level-3/0055-feel-odd-function/0055-feel-odd-function.dmn b/TestCases/compliance-level-3/0055-feel-odd-function/0055-feel-odd-function.dmn
index 6580c66a1..fb88b54d1 100644
--- a/TestCases/compliance-level-3/0055-feel-odd-function/0055-feel-odd-function.dmn
+++ b/TestCases/compliance-level-3/0055-feel-odd-function/0055-feel-odd-function.dmn
@@ -1,5 +1,5 @@
-
+
FEEL built-in function 'odd(number)' in category numeric functions
Tests FEEL expression: 'odd(2)' and expects result: 'false (boolean)'
diff --git a/TestCases/compliance-level-3/0056-feel-modulo-function/0056-feel-modulo-function.dmn b/TestCases/compliance-level-3/0056-feel-modulo-function/0056-feel-modulo-function.dmn
index b6ac27709..01e94d57d 100644
--- a/TestCases/compliance-level-3/0056-feel-modulo-function/0056-feel-modulo-function.dmn
+++ b/TestCases/compliance-level-3/0056-feel-modulo-function/0056-feel-modulo-function.dmn
@@ -1,5 +1,5 @@
-
+
FEEL built-in function 'modulo(dividend,divisor)' in category numeric functions
Tests FEEL expression: 'modulo(10, 4)' and expects result: '2 (number)'
diff --git a/TestCases/compliance-level-3/0057-feel-context/0057-feel-context.dmn b/TestCases/compliance-level-3/0057-feel-context/0057-feel-context.dmn
index 12a177396..018b74dc5 100644
--- a/TestCases/compliance-level-3/0057-feel-context/0057-feel-context.dmn
+++ b/TestCases/compliance-level-3/0057-feel-context/0057-feel-context.dmn
@@ -1,5 +1,5 @@
-
+
FEEL contexts
diff --git a/TestCases/compliance-level-3/0058-feel-number-function/0058-feel-number-function.dmn b/TestCases/compliance-level-3/0058-feel-number-function/0058-feel-number-function.dmn
index 8b280690c..f0b49851a 100644
--- a/TestCases/compliance-level-3/0058-feel-number-function/0058-feel-number-function.dmn
+++ b/TestCases/compliance-level-3/0058-feel-number-function/0058-feel-number-function.dmn
@@ -1,5 +1,5 @@
-
+
FEEL built-in function 'modulo(dividend,divisor)' in category numeric functions
Tests FEEL expression: 'number("1.000.000,01", ".", ","))' and expects result: '1000000.01 (number)'
diff --git a/TestCases/compliance-level-3/0059-feel-all-function/0059-feel-all-function.dmn b/TestCases/compliance-level-3/0059-feel-all-function/0059-feel-all-function.dmn
index d5b199c73..dab34aa8a 100644
--- a/TestCases/compliance-level-3/0059-feel-all-function/0059-feel-all-function.dmn
+++ b/TestCases/compliance-level-3/0059-feel-all-function/0059-feel-all-function.dmn
@@ -1,5 +1,5 @@
-
+
FEEL built-in function 'all(list)' in category list functions
Tests FEEL expression: 'all([true, false, true])' and expects result: 'false (boolean)'
diff --git a/TestCases/compliance-level-3/0060-feel-any-function/0060-feel-any-function.dmn b/TestCases/compliance-level-3/0060-feel-any-function/0060-feel-any-function.dmn
index d1d7e94a4..7cdd38854 100644
--- a/TestCases/compliance-level-3/0060-feel-any-function/0060-feel-any-function.dmn
+++ b/TestCases/compliance-level-3/0060-feel-any-function/0060-feel-any-function.dmn
@@ -1,5 +1,5 @@
-
+
FEEL built-in function 'any(list)' in category list functions
Tests FEEL expression: 'any([true, false, true])' and expects result: 'true (boolean)'
diff --git a/TestCases/compliance-level-3/0061-feel-median-function/0061-feel-median-function.dmn b/TestCases/compliance-level-3/0061-feel-median-function/0061-feel-median-function.dmn
index 81c052914..c59516c4f 100644
--- a/TestCases/compliance-level-3/0061-feel-median-function/0061-feel-median-function.dmn
+++ b/TestCases/compliance-level-3/0061-feel-median-function/0061-feel-median-function.dmn
@@ -1,5 +1,5 @@
-
+
FEEL built-in function 'median(list)' in category list functions
diff --git a/TestCases/compliance-level-3/0062-feel-mode-function/0062-feel-mode-function.dmn b/TestCases/compliance-level-3/0062-feel-mode-function/0062-feel-mode-function.dmn
index d678bbfbb..1cd8f5188 100644
--- a/TestCases/compliance-level-3/0062-feel-mode-function/0062-feel-mode-function.dmn
+++ b/TestCases/compliance-level-3/0062-feel-mode-function/0062-feel-mode-function.dmn
@@ -1,5 +1,5 @@
-
+
FEEL built-in function 'mode(list)' in category list functions
diff --git a/TestCases/compliance-level-3/0063-feel-stddev-function/0063-feel-stddev-function.dmn b/TestCases/compliance-level-3/0063-feel-stddev-function/0063-feel-stddev-function.dmn
index 21069e3ed..3f237d3cf 100644
--- a/TestCases/compliance-level-3/0063-feel-stddev-function/0063-feel-stddev-function.dmn
+++ b/TestCases/compliance-level-3/0063-feel-stddev-function/0063-feel-stddev-function.dmn
@@ -1,5 +1,5 @@
-
+
FEEL built-in function 'stddev(list)' in category list functions
diff --git a/TestCases/compliance-level-3/0064-feel-conjunction/0064-feel-conjunction.dmn b/TestCases/compliance-level-3/0064-feel-conjunction/0064-feel-conjunction.dmn
index b891441c4..83ceb240b 100644
--- a/TestCases/compliance-level-3/0064-feel-conjunction/0064-feel-conjunction.dmn
+++ b/TestCases/compliance-level-3/0064-feel-conjunction/0064-feel-conjunction.dmn
@@ -1,5 +1,5 @@
-
+
Semantics of conjunction
Tests FEEL expression: 'true and true' and expects result: 'true (boolean)'
diff --git a/TestCases/compliance-level-3/0065-feel-disjunction/0065-feel-disjunction.dmn b/TestCases/compliance-level-3/0065-feel-disjunction/0065-feel-disjunction.dmn
index cb4cfc7e6..f18143101 100644
--- a/TestCases/compliance-level-3/0065-feel-disjunction/0065-feel-disjunction.dmn
+++ b/TestCases/compliance-level-3/0065-feel-disjunction/0065-feel-disjunction.dmn
@@ -1,5 +1,5 @@
-
+
Semantics of conjunction
Tests FEEL expression: 'true or true' and expects result: 'true (boolean)'
diff --git a/TestCases/compliance-level-3/0066-feel-negation/0066-feel-negation.dmn b/TestCases/compliance-level-3/0066-feel-negation/0066-feel-negation.dmn
index bf727f5d8..e2e9d56e9 100644
--- a/TestCases/compliance-level-3/0066-feel-negation/0066-feel-negation.dmn
+++ b/TestCases/compliance-level-3/0066-feel-negation/0066-feel-negation.dmn
@@ -1,5 +1,5 @@
-
+