diff --git a/TestCases/compliance-level-3/1157-unarytests-decisiontable/1157-unarytests-decisiontable-test-01.xml b/TestCases/compliance-level-3/1157-unarytests-decisiontable/1157-unarytests-decisiontable-test-01.xml
index f0e2cc3d..12cb0299 100644
--- a/TestCases/compliance-level-3/1157-unarytests-decisiontable/1157-unarytests-decisiontable-test-01.xml
+++ b/TestCases/compliance-level-3/1157-unarytests-decisiontable/1157-unarytests-decisiontable-test-01.xml
@@ -123,6 +123,17 @@
         </resultNode>
     </testCase>
 
+    <testCase id="008_b">
+        <!-- further to 008, an input expression of boolean "false" will not be satisfied against a rule
+         unary test of that evaluates to true -->
+        <description>input values: boolean expression is weird</description>
+        <resultNode name="decision008_b" type="decision">
+            <expected>
+                <value xsi:type="xsd:string">success</value>
+            </expected>
+        </resultNode>
+    </testCase>
+
     <testCase id="009">
         <description>output values: result satisfies output values</description>
         <resultNode name="decision009" type="decision">
@@ -205,4 +216,13 @@
         </resultNode>
     </testCase>
 
+    <testCase id="017">
+        <description>input values: ? used in expression outside of unary tests expressions</description>
+        <resultNode name="decision017" type="decision">
+            <expected>
+                <value xsi:type="xsd:string">success</value>
+            </expected>
+        </resultNode>
+    </testCase>
+
 </testCases>
diff --git a/TestCases/compliance-level-3/1157-unarytests-decisiontable/1157-unarytests-decisiontable.dmn b/TestCases/compliance-level-3/1157-unarytests-decisiontable/1157-unarytests-decisiontable.dmn
index a22c80ee..1c611b53 100644
--- a/TestCases/compliance-level-3/1157-unarytests-decisiontable/1157-unarytests-decisiontable.dmn
+++ b/TestCases/compliance-level-3/1157-unarytests-decisiontable/1157-unarytests-decisiontable.dmn
@@ -191,8 +191,7 @@
 
     <decision name="decision006_b" id="_decision006_b">
         <!-- '?' symbol  -->
-        <!-- input expression "foo" executed against "?" does not return true and thus the rule for null will be satisfied -->
-        <!-- spec states that an expression with "?" must return a boolean "true" for it to be satisfied -->
+        <!-- input expression "foo" executed against "?" does not return true but, does satisfy an equality check -->
         <variable name="decision006_b"/>
         <decisionTable>
             <input>
@@ -206,7 +205,7 @@
             <output/>
             <rule>
                 <inputEntry>
-                    <text>null</text>
+                    <text>"foo"</text>
                 </inputEntry>
                 <outputEntry>
                     <text>"success"</text>
@@ -241,6 +240,32 @@
         </decisionTable>
     </decision>
 
+    <decision name="decision006_d" id="_decision006_d">
+        <!-- '?' symbol  -->
+        <!-- input expression `false` executed against "?" returns false and thus an equality check is satisfied -->
+        <!-- spec states that an expression with "?" must return a boolean "true" for it to be satisfied -->
+        <variable name="decision006_d"/>
+        <decisionTable>
+            <input>
+                <inputExpression>
+                    <text>false</text>
+                </inputExpression>
+                <inputValues>
+                    <text>?</text>
+                </inputValues>
+            </input>
+            <output/>
+            <rule>
+                <inputEntry>
+                    <text>false</text>
+                </inputEntry>
+                <outputEntry>
+                    <text>"success"</text>
+                </outputEntry>
+            </rule>
+        </decisionTable>
+    </decision>
+
     <decision name="decision007" id="_decision007">
         <!-- input expression is valid against input values - input value has no text-->
         <!-- spec says text is optional -->
@@ -324,6 +349,32 @@
         </decisionTable>
     </decision>
 
+    <decision name="decision008_b" id="_decision008_b">
+        <!-- Odd handling for boolean. 'true' is an expression. Unary tests permit expressions but
+         in this case the input expression false will not satisfy unary tests and thus the
+         rule for null will be satisfied -->
+        <variable name="decision008_b"/>
+        <decisionTable>
+            <input>
+                <inputExpression>
+                    <text>false</text>
+                </inputExpression>
+                <inputValues>
+                    <text>1==1</text>
+                </inputValues>
+            </input>
+            <output/>
+            <rule>
+                <inputEntry>
+                    <text>null</text>
+                </inputEntry>
+                <outputEntry>
+                    <text>"success"</text>
+                </outputEntry>
+            </rule>
+        </decisionTable>
+    </decision>
+
     <decision name="decision009" id="_decision009">
         <!-- table result satisfies output values -->
         <variable name="decision009"/>
@@ -524,12 +575,11 @@
                 <inputExpression>
                     <text>123</text>
                 </inputExpression>
-            </input>
-            <output>
-                <outputValues>
+                <inputValues>
                     <text>string length(?) >= 3</text>
-                </outputValues>
-            </output>
+                </inputValues>
+            </input>
+            <output/>
             <rule>
                 <inputEntry>
                     <text>123</text>
@@ -541,5 +591,29 @@
         </decisionTable>
     </decision>
 
+    <decision name="decision017" id="_decision017">
+        <!-- ? is used in an expression, but is not one of the unary tests expressions -->
+        <variable name="decision017"/>
+        <decisionTable>
+            <input>
+                <inputExpression>
+                    <text>123</text>
+                </inputExpression>
+                <inputValues>
+                    <text>[345, ? = 123, 456]</text>
+                </inputValues>
+            </input>
+            <output/>
+            <rule>
+                <inputEntry>
+                    <text>null</text>
+                </inputEntry>
+                <outputEntry>
+                    <text>"success"</text>
+                </outputEntry>
+            </rule>
+        </decisionTable>
+    </decision>
+
 </definitions>