diff --git a/bpmn-unit-tests/expected-to-pass/single-activity-tests/exclusive-gateway/exclusive_gateway.bpmn b/bpmn-unit-tests/expected-to-pass/single-activity-tests/exclusive-gateway/exclusive_gateway.bpmn
index 0d5c9c3b..979ec79c 100644
--- a/bpmn-unit-tests/expected-to-pass/single-activity-tests/exclusive-gateway/exclusive_gateway.bpmn
+++ b/bpmn-unit-tests/expected-to-pass/single-activity-tests/exclusive-gateway/exclusive_gateway.bpmn
@@ -4,13 +4,13 @@
     <bpmn:startEvent id="StartEvent_1">
       <bpmn:outgoing>Flow_0vnkhc5</bpmn:outgoing>
     </bpmn:startEvent>
-    <bpmn:sequenceFlow id="Flow_0vnkhc5" sourceRef="StartEvent_1" targetRef="Manual_Task" />
+    <bpmn:sequenceFlow id="Flow_0vnkhc5" sourceRef="StartEvent_1" targetRef="Script_Task" />
     <bpmn:exclusiveGateway id="Gateway_04kw2o4" name="Exclusive Gateway">
       <bpmn:incoming>Flow_1vfbldw</bpmn:incoming>
       <bpmn:outgoing>Flow_0ejbl6k</bpmn:outgoing>
       <bpmn:outgoing>Flow_1hua65s</bpmn:outgoing>
     </bpmn:exclusiveGateway>
-    <bpmn:sequenceFlow id="Flow_1vfbldw" sourceRef="Manual_Task" targetRef="Gateway_04kw2o4" />
+    <bpmn:sequenceFlow id="Flow_1vfbldw" sourceRef="Script_Task" targetRef="Gateway_04kw2o4" />
     <bpmn:endEvent id="Event_0767czo">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>End Exclusive Gateway Unit Test. Variable value greater or equal to 10.</spiffworkflow:instructionsForEndUser>
@@ -29,13 +29,6 @@
     <bpmn:sequenceFlow id="Flow_1hua65s" sourceRef="Gateway_04kw2o4" targetRef="Activity_1tgpm05">
       <bpmn:conditionExpression>x &lt; 10</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:manualTask id="Manual_Task" name="Manual Task">
-      <bpmn:extensionElements>
-        <spiffworkflow:instructionsForEndUser />
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_0vnkhc5</bpmn:incoming>
-      <bpmn:outgoing>Flow_1vfbldw</bpmn:outgoing>
-    </bpmn:manualTask>
     <bpmn:sequenceFlow id="Flow_02hom7j" sourceRef="Activity_1tgpm05" targetRef="Event_08nh8ex" />
     <bpmn:sequenceFlow id="Flow_03q9vbw" sourceRef="Activity_0037bsk" targetRef="Event_0767czo" />
     <bpmn:scriptTask id="Activity_0037bsk" name="More than 10">
@@ -48,6 +41,14 @@
       <bpmn:outgoing>Flow_02hom7j</bpmn:outgoing>
       <bpmn:script>sel_val &lt; 10</bpmn:script>
     </bpmn:scriptTask>
+    <bpmn:scriptTask id="Script_Task" name="Script Task">
+      <bpmn:extensionElements>
+        <spiffworkflow:instructionsForEndUser />
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_0vnkhc5</bpmn:incoming>
+      <bpmn:outgoing>Flow_1vfbldw</bpmn:outgoing>
+      <bpmn:script>x=0</bpmn:script>
+    </bpmn:scriptTask>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Unit_Test_Exclusive_Gateway_Process">
@@ -60,16 +61,12 @@
           <dc:Bounds x="428" y="122" width="47" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1pidva9_di" bpmnElement="Manual_Task">
-        <dc:Bounds x="270" y="137" width="100" height="80" />
-        <bpmndi:BPMNLabel />
+      <bpmndi:BPMNShape id="Event_0767czo_di" bpmnElement="Event_0767czo">
+        <dc:Bounds x="682" y="159" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_08nh8ex_di" bpmnElement="Event_08nh8ex">
         <dc:Bounds x="682" y="272" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0767czo_di" bpmnElement="Event_0767czo">
-        <dc:Bounds x="682" y="159" width="36" height="36" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1dctjx0_di" bpmnElement="Activity_0037bsk">
         <dc:Bounds x="520" y="137" width="100" height="80" />
         <bpmndi:BPMNLabel />
@@ -78,6 +75,10 @@
         <dc:Bounds x="520" y="230" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1se64ud_di" bpmnElement="Script_Task">
+        <dc:Bounds x="270" y="137" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_0vnkhc5_di" bpmnElement="Flow_0vnkhc5">
         <di:waypoint x="215" y="177" />
         <di:waypoint x="270" y="177" />