diff --git a/misc/qa/madhu-testing/model-with-all-elements/model-with-all-elements.bpmn b/misc/qa/madhu-testing/model-with-all-elements/model-with-all-elements.bpmn
index 3292250d..3281e55f 100644
--- a/misc/qa/madhu-testing/model-with-all-elements/model-with-all-elements.bpmn
+++ b/misc/qa/madhu-testing/model-with-all-elements/model-with-all-elements.bpmn
@@ -382,19 +382,14 @@
     <bpmn:sequenceFlow id="Flow_0w1l15p" sourceRef="Activity_1ocfzii" targetRef="Activity_02tft4w" />
     <bpmn:sequenceFlow id="Flow_06ibn9g" sourceRef="Event_098jtyz" targetRef="Activity_1w17168" />
     <bpmn:sequenceFlow id="Flow_1osso7l" sourceRef="Activity_1w17168" targetRef="Event_1d4ipwo" />
-    <bpmn:dataObjectReference id="DO1" name="DataObject1" dataObjectRef="DO1" />
+    <bpmn:dataObjectReference id="DO1" name="Data Object 1" dataObjectRef="DO1" />
     <bpmn:endEvent id="Event_0jqx6cq">
       <bpmn:incoming>Flow_06oexpt</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:sequenceFlow id="Flow_1h0g8ke" sourceRef="Activity_02tft4w" targetRef="Activity_0rp59y8" />
-    <bpmn:dataObjectReference id="DataObjectReference_0dw8zdu" name="DataObject1" dataObjectRef="DO1" />
+    <bpmn:dataObjectReference id="DataObjectReference_0dw8zdu" name="Data Object 1" dataObjectRef="DO1" />
     <bpmn:sequenceFlow id="Flow_0z91073" sourceRef="Activity_0rp59y8" targetRef="Activity_1hpllxu" />
-    <bpmn:dataObject id="DO1" name="DataObject1" />
     <bpmn:sequenceFlow id="Flow_1f6tr1m" sourceRef="Activity_1hpllxu" targetRef="Gateway_09b4yam" />
-    <bpmn:dataObjectReference id="DataObjectReference_0dw8zdu" name="DataObject1" dataObjectRef="DO1" />
-    <bpmn:dataObjectReference id="DO1" name="DataObject1" dataObjectRef="DO1" />
-    <bpmn:dataObjectReference id="DataObjectReference_0dw8zdu" name="DataObject1" dataObjectRef="DO1" />
-    <bpmn:dataObjectReference id="DO1" name="DataObject1" dataObjectRef="DO1" />
     <bpmn:scriptTask id="Activity_0mz4qjo" name="Message Sent">
       <bpmn:incoming>Flow_1azlgvj</bpmn:incoming>
       <bpmn:outgoing>Flow_18gbvtt</bpmn:outgoing>
@@ -458,8 +453,6 @@
       <bpmn:outgoing>Flow_06ibn9g</bpmn:outgoing>
       <bpmn:errorEventDefinition id="ErrorEventDefinition_11vn1zs" errorRef="Error1" />
     </bpmn:boundaryEvent>
-    <bpmn:dataObjectReference id="DO1" name="DataObject1" dataObjectRef="DO1" />
-    <bpmn:dataObjectReference id="DO1" name="DataObject1" dataObjectRef="DO1" />
     <bpmn:manualTask id="Activity_1w17168" name="Request Rejected">
       <bpmn:incoming>Flow_06ibn9g</bpmn:incoming>
       <bpmn:outgoing>Flow_1osso7l</bpmn:outgoing>
@@ -467,8 +460,6 @@
     <bpmn:endEvent id="Event_1d4ipwo" name="Error End Event Triggered">
       <bpmn:incoming>Flow_1osso7l</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:dataObjectReference id="DataObjectReference_0dw8zdu" name="DataObject1" dataObjectRef="DO1" />
-    <bpmn:dataObjectReference id="DO1" name="DataObject1" dataObjectRef="DO1" />
     <bpmn:manualTask id="Activity_02tft4w" name="Manual Task">
       <bpmn:extensionElements>
         <spiffworkflow:preScript>DOval = DO1</spiffworkflow:preScript>
@@ -543,6 +534,7 @@
       <bpmn:incoming>Flow_01zt4ht</bpmn:incoming>
       <bpmn:outgoing>Flow_06oexpt</bpmn:outgoing>
     </bpmn:callActivity>
+    <bpmn:dataObject id="DO1" name="Data Object 1" />
   </bpmn:process>
   <bpmn:signal id="check_balance" name="check_balance">
     <bpmn:extensionElements>
@@ -655,68 +647,6 @@
         <dc:Bounds x="380" y="411" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1l725wg_di" bpmnElement="Activity_0mz4qjo">
-        <dc:Bounds x="2600" y="472" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0i58o6v_di" bpmnElement="Activity_15yuetc">
-        <dc:Bounds x="2600" y="940" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="DataObjectReference_03z8txs_di" bpmnElement="DO1">
-        <dc:Bounds x="2552" y="1205" width="36" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="2542" y="1262" width="62" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0sh54qz_di" bpmnElement="Activity_1w17168">
-        <dc:Bounds x="2070" y="1160" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_1d4ipwo_di" bpmnElement="Event_1d4ipwo">
-        <dc:Bounds x="2292" y="1182" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="2273" y="1225" width="80" height="27" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="DataObjectReference_0dw8zdu_di" bpmnElement="DataObjectReference_0dw8zdu">
-        <dc:Bounds x="1852" y="1205" width="36" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1842" y="1262" width="62" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1y9knrc_di" bpmnElement="Activity_02tft4w">
-        <dc:Bounds x="1740" y="940" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0rfrg6x_di" bpmnElement="Activity_0rp59y8">
-        <dc:Bounds x="1590" y="940" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_0bns4d5_di" bpmnElement="Gateway_09b4yam">
-        <dc:Bounds x="1345" y="955" width="50" height="50" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0c8uhb7_di" bpmnElement="Activity_1hpllxu">
-        <dc:Bounds x="1450" y="940" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0r47uv0_di" bpmnElement="Activity_0jqe03e">
-        <dc:Bounds x="1200" y="820" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1idtr98_di" bpmnElement="Activity_0lcjnrs">
-        <dc:Bounds x="1200" y="940" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_07wix4x_di" bpmnElement="Activity_03qzbkj">
-        <dc:Bounds x="1200" y="1060" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_163gfl9_di" bpmnElement="Gateway_1jx9agh">
-        <dc:Bounds x="1095" y="955" width="50" height="50" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0zu594f_di" bpmnElement="Activity_0qbje6g">
-        <dc:Bounds x="960" y="940" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1p6wtv8_di" bpmnElement="Activity_12t2hwu" isExpanded="true">
         <dc:Bounds x="1500" y="351" width="710" height="279" />
       </bpmndi:BPMNShape>
@@ -810,9 +740,27 @@
           <dc:Bounds x="1866" y="716" width="52" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="DataObjectReference_03z8txs_di" bpmnElement="DO1">
+        <dc:Bounds x="2552" y="1205" width="36" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2539" y="1262" width="68" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_0jqx6cq_di" bpmnElement="Event_0jqx6cq">
         <dc:Bounds x="612" y="962" width="36" height="36" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="DataObjectReference_0dw8zdu_di" bpmnElement="DataObjectReference_0dw8zdu">
+        <dc:Bounds x="1852" y="1205" width="36" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1839" y="1262" width="68" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1l725wg_di" bpmnElement="Activity_0mz4qjo">
+        <dc:Bounds x="2600" y="472" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0i58o6v_di" bpmnElement="Activity_15yuetc">
+        <dc:Bounds x="2600" y="940" width="100" height="80" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_11koohx_di" bpmnElement="Activity_1ocfzii" isExpanded="true">
         <dc:Bounds x="1900" y="840" width="630" height="280" />
       </bpmndi:BPMNShape>
@@ -860,6 +808,53 @@
         <di:waypoint x="2360" y="1040" />
         <di:waypoint x="2462" y="1040" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="Activity_0sh54qz_di" bpmnElement="Activity_1w17168">
+        <dc:Bounds x="2070" y="1160" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_1d4ipwo_di" bpmnElement="Event_1d4ipwo">
+        <dc:Bounds x="2292" y="1182" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2273" y="1225" width="80" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1y9knrc_di" bpmnElement="Activity_02tft4w">
+        <dc:Bounds x="1740" y="940" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0rfrg6x_di" bpmnElement="Activity_0rp59y8">
+        <dc:Bounds x="1590" y="940" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_0bns4d5_di" bpmnElement="Gateway_09b4yam">
+        <dc:Bounds x="1345" y="955" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0c8uhb7_di" bpmnElement="Activity_1hpllxu">
+        <dc:Bounds x="1450" y="940" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0r47uv0_di" bpmnElement="Activity_0jqe03e">
+        <dc:Bounds x="1200" y="820" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1idtr98_di" bpmnElement="Activity_0lcjnrs">
+        <dc:Bounds x="1200" y="940" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_07wix4x_di" bpmnElement="Activity_03qzbkj">
+        <dc:Bounds x="1200" y="1060" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_163gfl9_di" bpmnElement="Gateway_1jx9agh">
+        <dc:Bounds x="1095" y="955" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0zu594f_di" bpmnElement="Activity_0qbje6g">
+        <dc:Bounds x="960" y="940" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0oiewv3_di" bpmnElement="Event_098jtyz">
+        <dc:Bounds x="1921" y="1102" width="36" height="36" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_0sud57b_di" bpmnElement="Event_0a7j0za">
         <dc:Bounds x="1612" y="612" width="36" height="36" />
       </bpmndi:BPMNShape>
@@ -869,9 +864,6 @@
       <bpmndi:BPMNShape id="Event_1tsikld_di" bpmnElement="Event_148wg0d">
         <dc:Bounds x="1272" y="473" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0oiewv3_di" bpmnElement="Event_098jtyz">
-        <dc:Bounds x="1921" y="1102" width="36" height="36" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_1msk5h9_di" bpmnElement="Flow_1msk5h9">
         <di:waypoint x="-384" y="195" />
         <di:waypoint x="-329" y="195" />