diff --git a/misc/category_number_one/call-activity-multiple-calls/process_model.json b/misc/category_number_one/call-activity-multiple-calls/process_model.json
index 4b1566fe..95280c2f 100644
--- a/misc/category_number_one/call-activity-multiple-calls/process_model.json
+++ b/misc/category_number_one/call-activity-multiple-calls/process_model.json
@@ -1,10 +1,8 @@
 {
     "description": "",
     "display_name": "Call Activity Multiple Calls",
-    "display_order": 0,
     "exception_notification_addresses": [],
     "fault_or_suspend_on_exception": "fault",
-    "files": [],
     "metadata_extraction_paths": null,
     "primary_file_name": "start.bpmn",
     "primary_process_id": "Process_rmvgdyk"
diff --git a/misc/category_number_one/call-activity-multiple-calls/start.bpmn b/misc/category_number_one/call-activity-multiple-calls/start.bpmn
index b3df56d2..8e388e25 100644
--- a/misc/category_number_one/call-activity-multiple-calls/start.bpmn
+++ b/misc/category_number_one/call-activity-multiple-calls/start.bpmn
@@ -4,7 +4,6 @@
     <bpmn:startEvent id="StartEvent_1">
       <bpmn:outgoing>Flow_0m4suiu</bpmn:outgoing>
     </bpmn:startEvent>
-    <bpmn:sequenceFlow id="Flow_0m4suiu" sourceRef="StartEvent_1" targetRef="call_one" />
     <bpmn:endEvent id="Event_0pq4nje">
       <bpmn:incoming>Flow_04l47c7</bpmn:incoming>
     </bpmn:endEvent>
@@ -46,10 +45,11 @@ b = 1</spiffworkflow:preScript>
         <bpmn:outgoing>Flow_0jbrwwb</bpmn:outgoing>
       </bpmn:callActivity>
     </bpmn:subProcess>
-    <bpmn:sequenceFlow id="Flow_1fzxj1j" sourceRef="call_one" targetRef="call_two" />
-    <bpmn:sequenceFlow id="Flow_1rsg9zi" sourceRef="call_two" targetRef="call_three" />
     <bpmn:sequenceFlow id="Flow_0gknqdd" sourceRef="call_three" targetRef="sub_process_call_acitivty_multiple" />
     <bpmn:sequenceFlow id="Flow_04l47c7" sourceRef="sub_process_call_acitivty_multiple" targetRef="Event_0pq4nje" />
+    <bpmn:sequenceFlow id="Flow_0m4suiu" sourceRef="StartEvent_1" targetRef="call_one" />
+    <bpmn:sequenceFlow id="Flow_1fzxj1j" sourceRef="call_one" targetRef="call_two" />
+    <bpmn:sequenceFlow id="Flow_1rsg9zi" sourceRef="call_two" targetRef="call_three" />
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_rmvgdyk">
diff --git a/misc/category_number_one/process-model-with-form/process_model.json b/misc/category_number_one/process-model-with-form/process_model.json
index ea184d8a..ceeb2923 100644
--- a/misc/category_number_one/process-model-with-form/process_model.json
+++ b/misc/category_number_one/process-model-with-form/process_model.json
@@ -1,10 +1,8 @@
 {
     "description": "A Process Model with a form",
     "display_name": "Process Model With Form",
-    "display_order": 0,
     "exception_notification_addresses": [],
     "fault_or_suspend_on_exception": "fault",
-    "files": [],
     "metadata_extraction_paths": null,
     "primary_file_name": "test_form.bpmn",
     "primary_process_id": "test_form"
diff --git a/misc/category_number_one/process-model-with-form/test_form.bpmn b/misc/category_number_one/process-model-with-form/test_form.bpmn
index 40f733e4..b5c8d70b 100644
--- a/misc/category_number_one/process-model-with-form/test_form.bpmn
+++ b/misc/category_number_one/process-model-with-form/test_form.bpmn
@@ -28,6 +28,7 @@ this_will_delete = True</bpmn:script>
         </spiffworkflow:properties>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_0fia6jt</bpmn:incoming>
+      <bpmn:incoming>Flow_0uq0mat</bpmn:incoming>
       <bpmn:outgoing>Flow_0k1q81g</bpmn:outgoing>
     </bpmn:userTask>
     <bpmn:sequenceFlow id="Flow_0k1q81g" sourceRef="form2" targetRef="multiply2" />
@@ -115,7 +116,16 @@ HO
       <bpmn:outgoing>Flow_0fia6jt</bpmn:outgoing>
     </bpmn:intermediateThrowEvent>
     <bpmn:sequenceFlow id="Flow_06y928b" sourceRef="multiply1" targetRef="Event_0ypxbq7" />
+    <bpmn:sequenceFlow id="Flow_0uq0mat" sourceRef="Event_1gfda2e" targetRef="form2" />
+    <bpmn:boundaryEvent id="Event_1gfda2e" attachedToRef="form3">
+      <bpmn:extensionElements>
+        <spiffworkflow:signalButtonLabel>edit</spiffworkflow:signalButtonLabel>
+      </bpmn:extensionElements>
+      <bpmn:outgoing>Flow_0uq0mat</bpmn:outgoing>
+      <bpmn:signalEventDefinition id="SignalEventDefinition_1s7hfcv" signalRef="Signal_091abqk" />
+    </bpmn:boundaryEvent>
   </bpmn:process>
+  <bpmn:signal id="Signal_091abqk" name="Signal_091abqk" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="test_form">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
@@ -156,15 +166,18 @@ HO
         <dc:Bounds x="760" y="77" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0c1khwq_di" bpmnElement="form_subprocess" isExpanded="false">
+        <dc:Bounds x="230" y="210" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_12oudfm_di" bpmnElement="Event_0ypxbq7">
         <dc:Bounds x="342" y="212" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="348" y="255" width="24" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0c1khwq_di" bpmnElement="form_subprocess" isExpanded="false">
-        <dc:Bounds x="230" y="210" width="100" height="80" />
-        <bpmndi:BPMNLabel />
+      <bpmndi:BPMNShape id="Event_14pwany_di" bpmnElement="Event_1gfda2e">
+        <dc:Bounds x="592" y="272" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0lvudp8_di" bpmnElement="SequenceFlow_0lvudp8">
         <di:waypoint x="147" y="110" />
@@ -228,6 +241,12 @@ HO
         <di:waypoint x="360" y="185" />
         <di:waypoint x="360" y="212" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0uq0mat_di" bpmnElement="Flow_0uq0mat">
+        <di:waypoint x="610" y="308" />
+        <di:waypoint x="610" y="328" />
+        <di:waypoint x="490" y="328" />
+        <di:waypoint x="490" y="290" />
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
   <bpmndi:BPMNDiagram id="BPMNDiagram_0jwlhvm">