diff --git a/bpmn-unit-tests/expected-to-pass/single-activity-tests/sub-process-with-manual-task/sub_process_with_manual_task.bpmn b/bpmn-unit-tests/expected-to-pass/single-activity-tests/sub-process-with-manual-task/sub_process_with_manual_task.bpmn
index ca4ec7e5..12b89708 100644
--- a/bpmn-unit-tests/expected-to-pass/single-activity-tests/sub-process-with-manual-task/sub_process_with_manual_task.bpmn
+++ b/bpmn-unit-tests/expected-to-pass/single-activity-tests/sub-process-with-manual-task/sub_process_with_manual_task.bpmn
@@ -8,16 +8,15 @@
     <bpmn:subProcess id="Activity_0ite9b5" name="Sub Process with Manual Task">
       <bpmn:incoming>Flow_0gww7fb</bpmn:incoming>
       <bpmn:outgoing>Flow_1k53rtq</bpmn:outgoing>
-      <bpmn:outgoing>Flow_0c5l72z</bpmn:outgoing>
       <bpmn:startEvent id="Event_1fz3v4o">
         <bpmn:outgoing>Flow_0k03z4k</bpmn:outgoing>
       </bpmn:startEvent>
-      <bpmn:sequenceFlow id="Flow_0k03z4k" sourceRef="Event_1fz3v4o" targetRef="Activity_0tv8sbo" />
+      <bpmn:sequenceFlow id="Flow_0k03z4k" sourceRef="Event_1fz3v4o" targetRef="Sub_Process_Manual_Task" />
       <bpmn:endEvent id="Event_0b2zuv3">
         <bpmn:incoming>Flow_0gw12kj</bpmn:incoming>
       </bpmn:endEvent>
-      <bpmn:sequenceFlow id="Flow_0gw12kj" sourceRef="Activity_0tv8sbo" targetRef="Event_0b2zuv3" />
-      <bpmn:manualTask id="Activity_0tv8sbo" name="Sub Process Manual Task">
+      <bpmn:sequenceFlow id="Flow_0gw12kj" sourceRef="Sub_Process_Manual_Task" targetRef="Event_0b2zuv3" />
+      <bpmn:manualTask id="Sub_Process_Manual_Task" name="Sub Process Manual Task">
         <bpmn:extensionElements>
           <spiffworkflow:instructionsForEndUser>Sub Process Manual Task. Click to continue</spiffworkflow:instructionsForEndUser>
         </bpmn:extensionElements>
@@ -32,19 +31,12 @@
       <bpmn:incoming>Flow_1k53rtq</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:sequenceFlow id="Flow_1k53rtq" sourceRef="Activity_0ite9b5" targetRef="Event_1uvvy10" />
-    <bpmn:task id="Activity_10vs33w">
-      <bpmn:incoming>Flow_0c5l72z</bpmn:incoming>
-    </bpmn:task>
-    <bpmn:sequenceFlow id="Flow_0c5l72z" sourceRef="Activity_0ite9b5" targetRef="Activity_10vs33w" />
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Sub_Process_with_Manual_Task">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
         <dc:Bounds x="179" y="159" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_10vs33w_di" bpmnElement="Activity_10vs33w">
-        <dc:Bounds x="440" y="250" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0qj4owl_di" bpmnElement="Activity_0ite9b5">
         <dc:Bounds x="270" y="137" width="100" height="80" />
       </bpmndi:BPMNShape>
@@ -59,12 +51,6 @@
         <di:waypoint x="370" y="177" />
         <di:waypoint x="432" y="177" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0c5l72z_di" bpmnElement="Flow_0c5l72z">
-        <di:waypoint x="370" y="177" />
-        <di:waypoint x="410" y="177" />
-        <di:waypoint x="410" y="290" />
-        <di:waypoint x="440" y="290" />
-      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
   <bpmndi:BPMNDiagram id="BPMNDiagram_008cmx3">
@@ -75,7 +61,7 @@
       <bpmndi:BPMNShape id="Event_0b2zuv3_di" bpmnElement="Event_0b2zuv3">
         <dc:Bounds x="472" y="182" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1vwc1jr_di" bpmnElement="Activity_0tv8sbo">
+      <bpmndi:BPMNShape id="Activity_1vwc1jr_di" bpmnElement="Sub_Process_Manual_Task">
         <dc:Bounds x="320" y="160" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_0k03z4k_di" bpmnElement="Flow_0k03z4k">