diff --git a/waku-messages/message/waku-message-body.dmn b/waku-messages/message/waku-message-body.dmn
index f3d611a5..92a852cb 100644
--- a/waku-messages/message/waku-message-body.dmn
+++ b/waku-messages/message/waku-message-body.dmn
@@ -14,12 +14,12 @@
       </input>
       <input id="InputClause_1ehumxj" label="PL Comments?" biodi:width="150">
         <inputExpression id="LiteralExpression_0f6zpyb" typeRef="boolean">
-          <text>len_project_lead_comments &gt; 0</text>
+          <text>len_project_lead_comments</text>
         </inputExpression>
       </input>
       <input id="InputClause_0vbjfl3" label="Finance Comments?" biodi:width="174">
         <inputExpression id="LiteralExpression_16asvyu" typeRef="boolean">
-          <text>len_finance_comments &gt; 0</text>
+          <text>len_finance_comments</text>
         </inputExpression>
       </input>
       <output id="output_1" label="Message Body" name="waku_message_body" typeRef="string" biodi:width="532" />
@@ -82,10 +82,10 @@
           <text>"waku_invoice_rejected"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_1rqyjru">
-          <text>True</text>
+          <text>"&gt;0"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_0b1859y">
-          <text>False</text>
+          <text>0</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_19448fp">
           <text>"Hi " + current_user_extras["first_name"] + ", your invoice has been rejected by your Project Lead. The reason specified for the rejection is: " + invoice.commentsProjectLead</text>
@@ -99,10 +99,10 @@
           <text>"waku_invoice_rejected"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_1xqwyfp">
-          <text>False</text>
+          <text>0</text>
         </inputEntry>
         <inputEntry id="UnaryTests_0zpo3f1">
-          <text>True</text>
+          <text>"&gt;0"</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_0eqnx58">
           <text>"Hi " + current_user_extras["first_name"] + ", your invoice has been rejected by Finance. The reason specified for the rejection is: " + invoice.commentsFinance</text>