diff --git a/misc/qa/bpmn-model-testing/unit-test-pre-scripts-post-scripts-for-tasks/unit-test-pre-scripts-post-scripts-for-tasks.bpmn b/misc/qa/bpmn-model-testing/unit-test-pre-scripts-post-scripts-for-tasks/unit-test-pre-scripts-post-scripts-for-tasks.bpmn
index 9f127815..d10d4e80 100644
--- a/misc/qa/bpmn-model-testing/unit-test-pre-scripts-post-scripts-for-tasks/unit-test-pre-scripts-post-scripts-for-tasks.bpmn
+++ b/misc/qa/bpmn-model-testing/unit-test-pre-scripts-post-scripts-for-tasks/unit-test-pre-scripts-post-scripts-for-tasks.bpmn
@@ -53,7 +53,7 @@ Manual_task_3 = {{manual_task_3}}</spiffworkflow:instructionsForEndUser>
       <bpmn:outgoing>Flow_0kty908</bpmn:outgoing>
     </bpmn:manualTask>
     <bpmn:sequenceFlow id="Flow_0kty908" sourceRef="Activity_1nk76nr" targetRef="Activity_1724gg7" />
-    <bpmn:manualTask id="Activity_1724gg7" name="Show Manual Task Data">
+    <bpmn:manualTask id="Activity_1724gg7" name="Show Manual Task Data 1">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>Manual Task var 1 = {{manual_task_1}},
 Manual Task var 2 = {{manual_task_2}},
@@ -94,7 +94,7 @@ Service_task_2 = {{service_task_2}}</spiffworkflow:instructionsForEndUser>
       <bpmn:outgoing>Flow_0ghbvoe</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:sequenceFlow id="Flow_0ghbvoe" sourceRef="Activity_1cmc6ij" targetRef="Activity_18wlmcj" />
-    <bpmn:manualTask id="Activity_18wlmcj" name="Show service Task Data">
+    <bpmn:manualTask id="Activity_18wlmcj" name="Show service Task Data 1">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>Service Task var 1 = {{service_task_1}},
 Service Task var 2 = {{service_task_2}}</spiffworkflow:instructionsForEndUser>
@@ -117,7 +117,7 @@ del(manual_task_3)</spiffworkflow:postScript>
       <bpmn:outgoing>Flow_1hzsoui</bpmn:outgoing>
     </bpmn:businessRuleTask>
     <bpmn:sequenceFlow id="Flow_1hzsoui" sourceRef="Activity_1gu179k" targetRef="Activity_1abcuai" />
-    <bpmn:manualTask id="Activity_1abcuai" name="Show BR Task Data">
+    <bpmn:manualTask id="Activity_1abcuai" name="Show BR Task Data 1">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>Business Rule Task 1 = {{businessrule_task_1}},
 Business Rule Task 2 = {{businessrule_task_2}},
@@ -129,7 +129,7 @@ User Role = {{test_role}}</spiffworkflow:instructionsForEndUser>
     </bpmn:manualTask>
     <bpmn:sequenceFlow id="Flow_0lv8c94" sourceRef="Activity_1abcuai" targetRef="Activity_0uw8p7i" />
     <bpmn:sequenceFlow id="Flow_0c3kbws" sourceRef="Activity_0uw8p7i" targetRef="Activity_1xl1vnt" />
-    <bpmn:manualTask id="Activity_1xl1vnt" name="Show Send Task Data">
+    <bpmn:manualTask id="Activity_1xl1vnt" name="Show Send Task Data 1">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>Send Task var 1 = {{send_task_1}},
 Send Task var 2 = {{send_task_2}},
@@ -140,7 +140,7 @@ payload = {{payload}}</spiffworkflow:instructionsForEndUser>
     </bpmn:manualTask>
     <bpmn:sequenceFlow id="Flow_0zbzkxg" sourceRef="Activity_1xl1vnt" targetRef="Activity_0y4kkn9" />
     <bpmn:sequenceFlow id="Flow_1an8bg3" sourceRef="Activity_0y4kkn9" targetRef="Activity_0atjlml" />
-    <bpmn:manualTask id="Activity_0atjlml" name="Show ReceiveTask Data">
+    <bpmn:manualTask id="Activity_0atjlml" name="Show ReceiveTask Data 1">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>Receive Task var 1 = {{receive_task_1}},
 Receive Task var 2 = {{receive_task_2}}</spiffworkflow:instructionsForEndUser>
@@ -198,7 +198,7 @@ Collapsed subprocess var 2 = {{collapsed_subprocess_activity_2}}</spiffworkflow:
       </bpmn:manualTask>
     </bpmn:subProcess>
     <bpmn:sequenceFlow id="Flow_170ycko" sourceRef="Activity_0tw18gv" targetRef="Activity_01e995n" />
-    <bpmn:manualTask id="Activity_01e995n" name="Show Collapsed sub process Data">
+    <bpmn:manualTask id="Activity_01e995n" name="Show Collapsed sub process Data 1">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>Collapsed subprocess var 1 = {{collapsed_subprocess_activity_1}},
 Collapsed subprocess var 2 = {{collapsed_subprocess_activity_2}}</spiffworkflow:instructionsForEndUser>
@@ -266,7 +266,7 @@ Expanded subprocess var 2 = {{expanded_subprocess_activity_2}}</spiffworkflow:in
       <bpmn:incoming>Flow_093yt3c</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:sequenceFlow id="Flow_02y9dpv" sourceRef="Activity_052k826" targetRef="Activity_1gzwd72" />
-    <bpmn:manualTask id="Activity_052k826" name="Show expanded sub process Data">
+    <bpmn:manualTask id="Activity_052k826" name="Show expanded sub process Data 1">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>Expanded subprocess var 1 = {{expanded_subprocess_activity_1}},
 Expanded subprocess var 2 = {{expanded_subprocess_activity_2}}</spiffworkflow:instructionsForEndUser>
@@ -313,7 +313,7 @@ z is {{z}}</spiffworkflow:instructionsForEndUser>
       <bpmn:standardLoopCharacteristics loopMaximum="3" spiffworkflow:scriptsOnInstances="true" />
     </bpmn:manualTask>
     <bpmn:sequenceFlow id="Flow_1bnswgl" sourceRef="Activity_0cvjffh" targetRef="Activity_1hb0gf3" />
-    <bpmn:manualTask id="Activity_0cvjffh" name="Show Manual Loop Task (Script on Inst) Data">
+    <bpmn:manualTask id="Activity_0cvjffh" name="Show Manual Loop Task (Script on Inst) Data 1">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>y = {{y}}
 z = {{z}}</spiffworkflow:instructionsForEndUser>
@@ -336,7 +336,7 @@ z is {{z}}</spiffworkflow:instructionsForEndUser>
       <bpmn:standardLoopCharacteristics loopMaximum="2" />
     </bpmn:manualTask>
     <bpmn:sequenceFlow id="Flow_03b91xx" sourceRef="Activity_1f10bdx" targetRef="Activity_11rxivj" />
-    <bpmn:manualTask id="Activity_1f10bdx" name="Show Manual Loop Task Data">
+    <bpmn:manualTask id="Activity_1f10bdx" name="Show Manual Loop Task Data 1">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>y = {{y}}
 z = {{z}}</spiffworkflow:instructionsForEndUser>
@@ -375,7 +375,6 @@ z = {{z}}</spiffworkflow:instructionsForEndUser>
     </bpmn:manualTask>
   </bpmn:process>
   <bpmn:message id="PrePostScriptMsg" name="PrePostScriptMsg" />
-  <bpmn:correlationKey id="CorrelationKey_1yly25f" name="MainCorrelationKey" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_unit_test_pre_scripts_post_scripts_for_tasks_mg2fcs0">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
@@ -395,6 +394,7 @@ z = {{z}}</spiffworkflow:instructionsForEndUser>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0wfvi2h_di" bpmnElement="Activity_1724gg7">
         <dc:Bounds x="780" y="137" width="100" height="80" />
+        <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1u6i1xs_di" bpmnElement="Activity_1cmc6ij">
         <dc:Bounds x="950" y="137" width="100" height="80" />
@@ -434,6 +434,7 @@ z = {{z}}</spiffworkflow:instructionsForEndUser>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_035rb82_di" bpmnElement="Activity_01e995n">
         <dc:Bounds x="480" y="500" width="100" height="80" />
+        <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1e0i0vz_di" bpmnElement="Activity_1iogzej" isExpanded="true">
         <dc:Bounds x="720" y="440" width="350" height="200" />
@@ -486,6 +487,7 @@ z = {{z}}</spiffworkflow:instructionsForEndUser>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1iqkjfa_di" bpmnElement="Activity_1f10bdx">
         <dc:Bounds x="640" y="680" width="100" height="80" />
+        <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_18dgdi8_di" bpmnElement="Activity_11rxivj">
         <dc:Bounds x="450" y="680" width="100" height="80" />