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 b851b5c6..fa6f3f2d 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,26 +9,21 @@
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>End Call Activity with Manual Task Unit Test</spiffworkflow:instructionsForEndUser>
       </bpmn:extensionElements>
-      <bpmn:incoming>Flow_0ydfxs9</bpmn:incoming>
+      <bpmn:incoming>Flow_0ppwtii</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:sequenceFlow id="Flow_0p08lwv" sourceRef="Activity_1s0zolw" targetRef="Activity_1hqaz2w" />
     <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_0ppwtii" sourceRef="Activity_1hqaz2w" targetRef="Activity_0s5ikly" />
-    <bpmn:manualTask id="Activity_1hqaz2w" name="MMMM">
+    <bpmn:sequenceFlow id="Flow_0ppwtii" sourceRef="Activity_1hqaz2w" targetRef="Event_1xwu325" />
+    <bpmn:manualTask id="Activity_1hqaz2w" name="MM">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>aa</spiffworkflow:instructionsForEndUser>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_0p08lwv</bpmn:incoming>
       <bpmn:outgoing>Flow_0ppwtii</bpmn:outgoing>
     </bpmn:manualTask>
-    <bpmn:sequenceFlow id="Flow_0ydfxs9" sourceRef="Activity_0s5ikly" targetRef="Event_1xwu325" />
-    <bpmn:manualTask id="Activity_0s5ikly" name="DDD">
-      <bpmn:incoming>Flow_0ppwtii</bpmn:incoming>
-      <bpmn:outgoing>Flow_0ydfxs9</bpmn:outgoing>
-    </bpmn:manualTask>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Unit_Test_Call_Activity_with_Manual_Task">
@@ -38,22 +33,18 @@
           <dc:Bounds x="158" y="202" width="67" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0es9ftq_di" bpmnElement="Activity_1s0zolw">
-        <dc:Bounds x="270" y="137" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1yt3k13_di" bpmnElement="Activity_1hqaz2w">
-        <dc:Bounds x="410" y="137" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_1xwu325_di" bpmnElement="Event_1xwu325">
         <dc:Bounds x="772" y="159" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="759" y="202" width="63" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0cjwbz8_di" bpmnElement="Activity_0s5ikly">
-        <dc:Bounds x="560" y="137" width="100" height="80" />
+      <bpmndi:BPMNShape id="Activity_0es9ftq_di" bpmnElement="Activity_1s0zolw">
+        <dc:Bounds x="270" y="137" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1yt3k13_di" bpmnElement="Activity_1hqaz2w">
+        <dc:Bounds x="410" y="137" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_02pymet_di" bpmnElement="Flow_02pymet">
@@ -66,10 +57,6 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0ppwtii_di" bpmnElement="Flow_0ppwtii">
         <di:waypoint x="510" y="177" />
-        <di:waypoint x="560" y="177" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0ydfxs9_di" bpmnElement="Flow_0ydfxs9">
-        <di:waypoint x="660" y="177" />
         <di:waypoint x="772" y="177" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>