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 1c6d6e0b..9f127815 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
@@ -35,7 +35,7 @@ User Task Var 3 = {{user_task_3}}</spiffworkflow:instructionsForEndUser>
       <bpmn:outgoing>Flow_0t5wjjo</bpmn:outgoing>
     </bpmn:manualTask>
     <bpmn:sequenceFlow id="Flow_0t5wjjo" sourceRef="Activity_1aa2xu6" targetRef="Activity_1nk76nr" />
-    <bpmn:manualTask id="Activity_1nk76nr" name="Manual Task">
+    <bpmn:manualTask id="Activity_1nk76nr" name="Manual Task 1">
       <bpmn:extensionElements>
         <spiffworkflow:preScript>manual_task_1 = 10
 manual_task_2 = 20
@@ -44,7 +44,8 @@ manual_task_3 = 30</spiffworkflow:preScript>
 del(manual_task_1)
 del(user_task_3)
 </spiffworkflow:postScript>
-        <spiffworkflow:instructionsForEndUser>Manual_task_1 =  {{manual_task_1}},
+        <spiffworkflow:instructionsForEndUser>Hello from migration!
+Manual_task_1 =  {{manual_task_1}},
 Manual_task_2 = {{manual_task_2}},
 Manual_task_3 = {{manual_task_3}}</spiffworkflow:instructionsForEndUser>
       </bpmn:extensionElements>
@@ -62,7 +63,7 @@ Manual Task var 3 = {{manual_task_3}}</spiffworkflow:instructionsForEndUser>
       <bpmn:outgoing>Flow_0is9d8n</bpmn:outgoing>
     </bpmn:manualTask>
     <bpmn:sequenceFlow id="Flow_0is9d8n" sourceRef="Activity_1724gg7" targetRef="Activity_1cmc6ij" />
-    <bpmn:serviceTask id="Activity_1cmc6ij" name="Service Task">
+    <bpmn:serviceTask id="Activity_1cmc6ij" name="Service Task 1">
       <bpmn:extensionElements>
         <spiffworkflow:preScript>service_task_1 = 50
 service_task_2 = 20</spiffworkflow:preScript>
@@ -102,7 +103,7 @@ Service Task var 2 = {{service_task_2}}</spiffworkflow:instructionsForEndUser>
       <bpmn:outgoing>Flow_0asdpkl</bpmn:outgoing>
     </bpmn:manualTask>
     <bpmn:sequenceFlow id="Flow_0asdpkl" sourceRef="Activity_18wlmcj" targetRef="Activity_1gu179k" />
-    <bpmn:businessRuleTask id="Activity_1gu179k" name="Business Rule Task">
+    <bpmn:businessRuleTask id="Activity_1gu179k" name="Business Rule Task 1">
       <bpmn:extensionElements>
         <spiffworkflow:preScript>businessrule_task_1 = 12
 businessrule_task_2 = 24
@@ -148,7 +149,7 @@ Receive Task var 2 = {{receive_task_2}}</spiffworkflow:instructionsForEndUser>
       <bpmn:outgoing>Flow_0s5vj9x</bpmn:outgoing>
     </bpmn:manualTask>
     <bpmn:sequenceFlow id="Flow_0s5vj9x" sourceRef="Activity_0atjlml" targetRef="Activity_07grwzj" />
-    <bpmn:callActivity id="Activity_07grwzj" name="Call Activity" calledElement="Unit_Test_User_Task">
+    <bpmn:callActivity id="Activity_07grwzj" name="Call Activity 1" calledElement="Unit_Test_User_Task">
       <bpmn:extensionElements>
         <spiffworkflow:preScript>call_activity_1 = 100
 call_activity_2 = 200</spiffworkflow:preScript>
@@ -170,7 +171,7 @@ Call Activity var 2 = {{call_activity_2}}</spiffworkflow:instructionsForEndUser>
       <bpmn:outgoing>Flow_082ftez</bpmn:outgoing>
     </bpmn:manualTask>
     <bpmn:sequenceFlow id="Flow_082ftez" sourceRef="Activity_0yvvb2l" targetRef="Activity_0tw18gv" />
-    <bpmn:subProcess id="Activity_0tw18gv" name="Sub process Collpased">
+    <bpmn:subProcess id="Activity_0tw18gv" name="Sub process Collpased 1">
       <bpmn:extensionElements>
         <spiffworkflow:preScript>collapsed_subprocess_activity_1 = 44
 collapsed_subprocess_activity_2 = 55</spiffworkflow:preScript>
@@ -206,7 +207,7 @@ Collapsed subprocess var 2 = {{collapsed_subprocess_activity_2}}</spiffworkflow:
       <bpmn:outgoing>Flow_1evk14h</bpmn:outgoing>
     </bpmn:manualTask>
     <bpmn:sequenceFlow id="Flow_1evk14h" sourceRef="Activity_01e995n" targetRef="Activity_1iogzej" />
-    <bpmn:subProcess id="Activity_1iogzej">
+    <bpmn:subProcess id="Activity_1iogzej" name="Expanded Sub process 1">
       <bpmn:extensionElements>
         <spiffworkflow:preScript>expanded_subprocess_activity_1 = 7
 expanded_subprocess_activity_2 = 8</spiffworkflow:preScript>
@@ -219,7 +220,7 @@ del(expanded_subprocess_activity_1)</spiffworkflow:postScript>
         <bpmn:outgoing>Flow_1n7zz5j</bpmn:outgoing>
       </bpmn:startEvent>
       <bpmn:sequenceFlow id="Flow_1n7zz5j" sourceRef="Event_05j3k5i" targetRef="Activity_02l6kma" />
-      <bpmn:manualTask id="Activity_02l6kma" name="Show Message">
+      <bpmn:manualTask id="Activity_02l6kma" name="Show Message 1">
         <bpmn:extensionElements>
           <spiffworkflow:instructionsForEndUser>Hello from Expanded Sub process with Expanded subprocess var 1 = {{expanded_subprocess_activity_1}},
 Expanded subprocess var 2 = {{expanded_subprocess_activity_2}}</spiffworkflow:instructionsForEndUser>
@@ -275,21 +276,22 @@ z = 0</spiffworkflow:postScript>
       <bpmn:incoming>Flow_0beubtn</bpmn:incoming>
       <bpmn:outgoing>Flow_02y9dpv</bpmn:outgoing>
     </bpmn:manualTask>
-    <bpmn:receiveTask id="Activity_0y4kkn9" name="Receive Task">
+    <bpmn:receiveTask id="Activity_0y4kkn9" name="Receive Task 1" messageRef="PrePostScriptMsg">
       <bpmn:extensionElements>
         <spiffworkflow:preScript>receive_task_1 = 11
 receive_task_2 = 22</spiffworkflow:preScript>
         <spiffworkflow:postScript># Delete Unneeded Variable
 del(receive_task_1)</spiffworkflow:postScript>
+        <spiffworkflow:messageVariable>retPayload</spiffworkflow:messageVariable>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_0zbzkxg</bpmn:incoming>
       <bpmn:outgoing>Flow_1an8bg3</bpmn:outgoing>
     </bpmn:receiveTask>
-    <bpmn:sendTask id="Activity_0uw8p7i" name="Send Task" messageRef="PrePostScriptMsg">
+    <bpmn:sendTask id="Activity_0uw8p7i" name="Send Task 1" messageRef="PrePostScriptMsg">
       <bpmn:extensionElements>
         <spiffworkflow:preScript>send_task_1 = 111
 send_task_2 = 222
-payload = {"name":"Joe", "age":35}</spiffworkflow:preScript>
+payload = {"name":"Joe", "age":37}</spiffworkflow:preScript>
         <spiffworkflow:postScript># Delete Unneeded Variable
 del(send_task_1)</spiffworkflow:postScript>
         <spiffworkflow:messagePayload>payload</spiffworkflow:messagePayload>
@@ -298,7 +300,7 @@ del(send_task_1)</spiffworkflow:postScript>
       <bpmn:outgoing>Flow_0c3kbws</bpmn:outgoing>
     </bpmn:sendTask>
     <bpmn:sequenceFlow id="Flow_1e1djbi" sourceRef="Activity_1gzwd72" targetRef="Activity_0cvjffh" />
-    <bpmn:manualTask id="Activity_1gzwd72" name="Manual Loop Task (Script on Inst)">
+    <bpmn:manualTask id="Activity_1gzwd72" name="Manual Loop Task (Script on Inst) 1">
       <bpmn:extensionElements>
         <spiffworkflow:preScript>y = y+1</spiffworkflow:preScript>
         <spiffworkflow:postScript>z = z+1</spiffworkflow:postScript>
@@ -322,7 +324,7 @@ z =10</spiffworkflow:postScript>
       <bpmn:outgoing>Flow_1bnswgl</bpmn:outgoing>
     </bpmn:manualTask>
     <bpmn:sequenceFlow id="Flow_0ssa1ws" sourceRef="Activity_1hb0gf3" targetRef="Activity_1f10bdx" />
-    <bpmn:manualTask id="Activity_1hb0gf3" name="Manual Loop Task">
+    <bpmn:manualTask id="Activity_1hb0gf3" name="Manual Loop Task 1">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>y is {{y}}
 z is {{z}}</spiffworkflow:instructionsForEndUser>
@@ -331,7 +333,7 @@ z is {{z}}</spiffworkflow:instructionsForEndUser>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1bnswgl</bpmn:incoming>
       <bpmn:outgoing>Flow_0ssa1ws</bpmn:outgoing>
-      <bpmn:standardLoopCharacteristics loopMaximum="5" />
+      <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">
@@ -343,7 +345,7 @@ z = {{z}}</spiffworkflow:instructionsForEndUser>
       <bpmn:outgoing>Flow_03b91xx</bpmn:outgoing>
     </bpmn:manualTask>
     <bpmn:sequenceFlow id="Flow_15q2px7" sourceRef="Activity_11rxivj" targetRef="Activity_0bladrd" />
-    <bpmn:userTask id="Activity_11rxivj" name="Parallel Multi Instance (Script on Inst)">
+    <bpmn:userTask id="Activity_11rxivj" name="Parallel Multi Instance (Script on Inst) 1">
       <bpmn:extensionElements>
         <spiffworkflow:properties>
           <spiffworkflow:property name="formJsonSchemaFilename" value="get-town-schema.json" />
@@ -373,6 +375,7 @@ 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">
@@ -425,21 +428,6 @@ z = {{z}}</spiffworkflow:instructionsForEndUser>
         <dc:Bounds x="180" y="500" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_013cml8_di" bpmnElement="Activity_0bladrd">
-        <dc:Bounds x="270" 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" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1iqkjfa_di" bpmnElement="Activity_1f10bdx">
-        <dc:Bounds x="640" y="680" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_18oeblh_di" bpmnElement="Activity_1hb0gf3">
-        <dc:Bounds x="820" y="680" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0q35qe1_di" bpmnElement="Activity_0tw18gv">
         <dc:Bounds x="330" y="500" width="100" height="80" />
         <bpmndi:BPMNLabel />
@@ -449,6 +437,7 @@ z = {{z}}</spiffworkflow:instructionsForEndUser>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1e0i0vz_di" bpmnElement="Activity_1iogzej" isExpanded="true">
         <dc:Bounds x="720" y="440" width="350" height="200" />
+        <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_05j3k5i_di" bpmnElement="Event_05j3k5i">
         <dc:Bounds x="760.3333333333334" y="522" width="36" height="36" />
@@ -491,6 +480,21 @@ z = {{z}}</spiffworkflow:instructionsForEndUser>
         <dc:Bounds x="1000" y="680" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_18oeblh_di" bpmnElement="Activity_1hb0gf3">
+        <dc:Bounds x="820" y="680" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1iqkjfa_di" bpmnElement="Activity_1f10bdx">
+        <dc:Bounds x="640" y="680" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_18dgdi8_di" bpmnElement="Activity_11rxivj">
+        <dc:Bounds x="450" y="680" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_013cml8_di" bpmnElement="Activity_0bladrd">
+        <dc:Bounds x="270" y="680" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_12pit63_di" bpmnElement="Flow_12pit63">
         <di:waypoint x="215" y="177" />
         <di:waypoint x="270" y="177" />