diff --git a/config/alfresco/workflow/invitation-moderated.bpmn20.xml b/config/alfresco/workflow/invitation-moderated.bpmn20.xml
index 4f6cfa674c..ae7a66dc83 100644
--- a/config/alfresco/workflow/invitation-moderated.bpmn20.xml
+++ b/config/alfresco/workflow/invitation-moderated.bpmn20.xml
@@ -28,7 +28,7 @@
                <activiti:field name="script">
                   <activiti:string>
                      execution.setVariable('imwf_reviewOutcome', task.getVariable('imwf_reviewOutcome'));
-                     execution.setVariable('imwf_reviewComments', (task.hasVariable('imwf_reviewOutcome') ? task.getVariable('imwf_reviewOutcome') : task.getVariable('bpm_comment')));
+                     execution.setVariable('imwf_reviewComments', task.getVariable('bpm_comment'));
                      execution.setVariable('imwf_reviewer', person.properties.userName);
                   </activiti:string>
                </activiti:field>
diff --git a/source/test-java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java b/source/test-java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java
index 15a22ccc0c..1c75902ed8 100644
--- a/source/test-java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java
+++ b/source/test-java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java
@@ -618,7 +618,7 @@ public abstract class AbstractInvitationServiceImplTest extends BaseAlfrescoSpri
         try
         {
             invitationService.approve(invitationId, "Have I not rejected this?");
-            assertTrue("rejected invitation not working", false);
+            fail("rejected invitation not working");
         }
         catch (Exception e)
         {
@@ -947,7 +947,7 @@ public abstract class AbstractInvitationServiceImplTest extends BaseAlfrescoSpri
         try
         {
             invitationService.approve(invitationId, "No Way Hosea!");
-            assertTrue("excetion not thrown", false);
+            fail("excetion not thrown");
 
         }
         catch (Exception e)
@@ -976,7 +976,7 @@ public abstract class AbstractInvitationServiceImplTest extends BaseAlfrescoSpri
         try
         {
             invitationService.approve(invitationId, "Have I not already done this?");
-            assertTrue("duplicate approve excetion not thrown", false);
+            fail("duplicate approve excetion not thrown");
         }
         catch (Exception e)
         {
@@ -1016,7 +1016,7 @@ public abstract class AbstractInvitationServiceImplTest extends BaseAlfrescoSpri
         try
         {
             invitationService.reject(invitationId, "No Way Hosea!");
-            assertTrue("excetion not thrown", false);
+            fail("excetion not thrown");
 
         }
         catch (Exception e)
@@ -1038,7 +1038,7 @@ public abstract class AbstractInvitationServiceImplTest extends BaseAlfrescoSpri
         try
         {
             invitationService.approve(invitationId, "Have I not rejected this?");
-            assertTrue("rejected invitation not working", false);
+            fail("rejected invitation not working");
         }
         catch (Exception e)
         {