diff --git a/test/discovery_test.rb b/test/discovery_test.rb
index 7528019..aaf3437 100644
--- a/test/discovery_test.rb
+++ b/test/discovery_test.rb
@@ -143,7 +143,7 @@ class DiscoveryTest < Minitest::Spec
       lanes: lanes_cfg
 
     assert_position_after states[14][:suspend_configuration],
-      ["suspend-Gateway_1kl7pnm", "suspend-Gateway_1g3fhu2", "End.success"],
+      ["suspend-Gateway_1kl7pnm", "suspend-Gateway_00n4dsm", "End.success"],
       lanes: lanes_cfg
 
     assert_nil states[15]
@@ -155,7 +155,7 @@ class DiscoveryTest < Minitest::Spec
     iteration_set = Trailblazer::Workflow::Introspect::Iteration::Set.from_discovered_states(states, lanes_cfg: lanes_cfg)
 
     testing_json = JSON.pretty_generate(Trailblazer::Workflow::Introspect::Iteration::Set::Serialize.(iteration_set, lanes_cfg: lanes_cfg))
-    # File.write "test/iteration_json.json",  testing_json
+    # File.write("test/iteration_json.json", testing_json)
     assert_equal testing_json, File.read("test/iteration_json.json")
 
     iteration_set_from_json = Trailblazer::Workflow::Introspect::Iteration::Set::Deserialize.(JSON.parse(testing_json), lanes_cfg: lanes_cfg)
@@ -273,7 +273,7 @@ class DiscoveryTestPlanTest < Minitest::Spec
 | ☝ ⏵︎Delete            | ⛾ ⏵︎Publish ⏵︎Delete ⏵︎Update ☝ ⏵︎Delete ⏵︎Cancel                     ☑ ◉End.failure | ⛾ ◉End.success             ☝ ◉End.success                        ☑ ◉End.failure |
 | ☝ ⏵︎Cancel            | ⛾ ⏵︎Publish ⏵︎Delete ⏵︎Update ☝ ⏵︎Delete ⏵︎Cancel                     ☑ ◉End.failure | ⛾ ⏵︎Publish ⏵︎Delete ⏵︎Update ☝ ⏵︎Update form ⏵︎Delete? form ⏵︎Publish ☑ ◉End.failure |
 | ☝ ⏵︎Archive           | ⛾ ⏵︎Archive                 ☝ ⏵︎Archive                            ☑ ◉End.failure | ⛾ ◉End.success             ☝ ◉End.success                        ☑ ◉End.failure |
-| ☝ ⏵︎Revise            | ⛾ ⏵︎Revise                  ☝ ⏵︎Revise                             ☑ ◉End.success | ⛾ ⏵︎Revise ⏵︎Notify approver ☝ ⏵︎Update form ⏵︎Notify approver       ☑ ◉End.success |
+| ☝ ⏵︎Revise            | ⛾ ⏵︎Revise                  ☝ ⏵︎Revise                             ☑ ◉End.success | ⛾ ⏵︎Revise ⏵︎Notify approver ☝ ⏵︎Revise form ⏵︎Notify approver       ☑ ◉End.success |
 +----------------------+---------------------------------------------------------------------------------+---------------------------------------------------------------------------------+)
   end
 end
diff --git a/test/generate_test.rb b/test/generate_test.rb
index 7b678da..8093157 100644
--- a/test/generate_test.rb
+++ b/test/generate_test.rb
@@ -362,7 +362,7 @@ class GenerateTest < Minitest::Spec
     data={:type=>:catch_event, :label=>"valid?"}>=>
     [#<struct Trailblazer::Activity::Schema::Intermediate::Out
       semantic=:success,
-      target="suspend-Gateway_1g3fhu2">],
+      target="suspend-Gateway_00n4dsm">],
    #<struct Trailblazer::Activity::Schema::Intermediate::TaskRef
     id="Event_1wly6jj",
     data={:type=>:catch_event, :label=>"invalid?"}>=>
@@ -674,6 +674,12 @@ class GenerateTest < Minitest::Spec
      {"resumes"=>
        ["catch-before-Activity_1165bw9", "catch-before-Activity_1dt5di5"],
       :type=>:suspend}>=>[],
+   #<struct Trailblazer::Activity::Schema::Intermediate::TaskRef
+    id="suspend-Gateway_00n4dsm",
+    data=
+     {"resumes"=>
+       ["catch-before-Activity_0zsock2", "catch-before-Activity_1dt5di5"],
+      :type=>:suspend}>=>[],
    #<struct Trailblazer::Activity::Schema::Intermediate::TaskRef
     id="suspend-gw-to-Event_1vrfxsv",
     data={"resumes"=>["Event_1vrfxsv"], :type=>:suspend}>=>[],
@@ -706,6 +712,7 @@ class GenerateTest < Minitest::Spec
    "suspend-Gateway_14h0q7a"=>:suspend,
    "suspend-Gateway_1d05yki"=>:suspend,
    "suspend-Gateway_0kknfje"=>:suspend,
+   "suspend-Gateway_00n4dsm"=>:suspend,
    "suspend-gw-to-Event_1vrfxsv"=>:suspend,
    "suspend-gw-to-Event_0j1jua6"=>:suspend,
    "suspend-gw-to-Event_19ha0ea"=>:suspend,