diff --git a/misc/qa/bpmn-model-testing/unit-test-call-activity-with-manual-task/Unit_Test_Call_Activity_with_Manual_Task.bpmn b/misc/qa/bpmn-model-testing/unit-test-call-activity-with-manual-task/Unit_Test_Call_Activity_with_Manual_Task.bpmn
index 6959ec52..9344e744 100644
--- a/misc/qa/bpmn-model-testing/unit-test-call-activity-with-manual-task/Unit_Test_Call_Activity_with_Manual_Task.bpmn
+++ b/misc/qa/bpmn-model-testing/unit-test-call-activity-with-manual-task/Unit_Test_Call_Activity_with_Manual_Task.bpmn
@@ -9,28 +9,28 @@
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>End Call Activity with Manual Task Unit Test</spiffworkflow:instructionsForEndUser>
       </bpmn:extensionElements>
-      <bpmn:incoming>Flow_1unrlim</bpmn:incoming>
+      <bpmn:incoming>Flow_0bnrfqt</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:sequenceFlow id="Flow_0p08lwv" sourceRef="Activity_1s0zolw" targetRef="Activity_1anatcq" />
+    <bpmn:sequenceFlow id="Flow_0p08lwv" sourceRef="Activity_1s0zolw" targetRef="Activity_00pmobi" />
     <bpmn:callActivity id="Activity_1s0zolw" name="Call Activity with Manual Task" calledElement="Unit_Test_Manual_Task">
       <bpmn:incoming>Flow_02pymet</bpmn:incoming>
       <bpmn:outgoing>Flow_0p08lwv</bpmn:outgoing>
     </bpmn:callActivity>
-    <bpmn:sequenceFlow id="Flow_09empco" sourceRef="Activity_1anatcq" targetRef="Activity_00pmobi" />
-    <bpmn:manualTask id="Activity_1anatcq" name="MMMM">
-      <bpmn:incoming>Flow_0p08lwv</bpmn:incoming>
-      <bpmn:outgoing>Flow_09empco</bpmn:outgoing>
-    </bpmn:manualTask>
     <bpmn:sequenceFlow id="Flow_0s9ch0g" sourceRef="Activity_00pmobi" targetRef="Activity_1b9gwt4" />
-    <bpmn:manualTask id="Activity_00pmobi" name="DD">
-      <bpmn:incoming>Flow_09empco</bpmn:incoming>
+    <bpmn:manualTask id="Activity_00pmobi" name="DDD">
+      <bpmn:incoming>Flow_0p08lwv</bpmn:incoming>
       <bpmn:outgoing>Flow_0s9ch0g</bpmn:outgoing>
     </bpmn:manualTask>
-    <bpmn:sequenceFlow id="Flow_1unrlim" sourceRef="Activity_1b9gwt4" targetRef="Event_1xwu325" />
+    <bpmn:sequenceFlow id="Flow_1unrlim" sourceRef="Activity_1b9gwt4" targetRef="Activity_1x3vfcn" />
     <bpmn:manualTask id="Activity_1b9gwt4" name="EE">
       <bpmn:incoming>Flow_0s9ch0g</bpmn:incoming>
       <bpmn:outgoing>Flow_1unrlim</bpmn:outgoing>
     </bpmn:manualTask>
+    <bpmn:sequenceFlow id="Flow_0bnrfqt" sourceRef="Activity_1x3vfcn" targetRef="Event_1xwu325" />
+    <bpmn:manualTask id="Activity_1x3vfcn" name="FF">
+      <bpmn:incoming>Flow_1unrlim</bpmn:incoming>
+      <bpmn:outgoing>Flow_0bnrfqt</bpmn:outgoing>
+    </bpmn:manualTask>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Unit_Test_Call_Activity_with_Manual_Task">
@@ -44,34 +44,30 @@
         <dc:Bounds x="270" y="137" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0kw5l0f_di" bpmnElement="Activity_1anatcq">
-        <dc:Bounds x="420" y="137" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_062515v_di" bpmnElement="Activity_00pmobi">
         <dc:Bounds x="560" y="137" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_1xwu325_di" bpmnElement="Event_1xwu325">
-        <dc:Bounds x="852" y="159" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="839" y="202" width="63" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0u89k9w_di" bpmnElement="Activity_1b9gwt4">
         <dc:Bounds x="690" y="137" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_1xwu325_di" bpmnElement="Event_1xwu325">
+        <dc:Bounds x="972" y="159" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="959" y="202" width="63" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0klmxr3_di" bpmnElement="Activity_1x3vfcn">
+        <dc:Bounds x="830" y="137" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_02pymet_di" bpmnElement="Flow_02pymet">
         <di:waypoint x="208" y="177" />
         <di:waypoint x="270" y="177" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0p08lwv_di" bpmnElement="Flow_0p08lwv">
         <di:waypoint x="370" y="177" />
-        <di:waypoint x="420" y="177" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_09empco_di" bpmnElement="Flow_09empco">
-        <di:waypoint x="520" y="177" />
         <di:waypoint x="560" y="177" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0s9ch0g_di" bpmnElement="Flow_0s9ch0g">
@@ -80,7 +76,11 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1unrlim_di" bpmnElement="Flow_1unrlim">
         <di:waypoint x="790" y="177" />
-        <di:waypoint x="852" y="177" />
+        <di:waypoint x="830" y="177" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0bnrfqt_di" bpmnElement="Flow_0bnrfqt">
+        <di:waypoint x="930" y="177" />
+        <di:waypoint x="972" y="177" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>