diff --git a/staff_features/agents/agent_edit_default_values.feature b/staff_features/agents/agent_edit_default_values.feature
index 9e7b6028..50c81ac2 100644
--- a/staff_features/agents/agent_edit_default_values.feature
+++ b/staff_features/agents/agent_edit_default_values.feature
@@ -2,12 +2,9 @@ Feature: Agent Edit Default Values
   Background:
     Given an administrator user is logged in
       And the Pre-populate Records option is checked in Repository Preferences
-      And an Agent type Person has been created
-      And an Agent type Family has been created
-      And an Agent type Corporate Entity has been created
-      And an Agent type Software has been created
+  Scenario: Edit Default Values of Agent Person
+    Given an Agent Person has been created
       And the user is on the Agents page
-  Scenario: Edit Default Values of Agent type Person
      When the user clicks on 'Edit Default Values'
       And the user clicks on 'Person' in the dropdown menu
       And the user clicks on 'Name Forms'
@@ -16,11 +13,13 @@ Feature: Agent Edit Default Values
       And the user fills in 'Rest of Name' with 'Rest name'
       And the user clicks on 'Save Person'
      Then the 'Defaults' updated message is displayed
-      And the new Agent type Person form has the following default values
-       | form_section | form_field           | form_value |
-       | Name Forms   | Primary Part of Name | Test name  |
-       | Name Forms   | Rest of Name         | Rest name  |
-  Scenario: Edit Default Values of Agent type Family
+      And the new Agent Person form has the following default values
+        | form_section | form_field           | form_value |
+        | Name Forms   | Primary Part of Name | Test name  |
+        | Name Forms   | Rest of Name         | Rest name  |
+  Scenario: Edit Default Values of Agent Family
+    Given an Agent Family has been created
+      And the user is on the Agents page
      When the user clicks on 'Edit Default Values'
       And the user clicks on 'Family' in the dropdown menu
       And the user clicks on 'Notes'
@@ -29,11 +28,13 @@ Feature: Agent Edit Default Values
       And the user fills in 'Content' with 'Test note'
       And the user clicks on 'Save Family'
      Then the 'Defaults' updated message is displayed
-      And the new Agent type Family form has the following default values
-       | form_section | form_field | form_value      |
-       | Notes        | Note Type  | General Context |
-       | Notes        | Content    | Test note       |
-  Scenario: Edit Default Values of Agent type Corporate Entity
+      And the new Agent Family form has the following default values
+        | form_section | form_field | form_value      |
+        | Notes        | Note Type  | General Context |
+        | Notes        | Content    | Test note       |
+  Scenario: Edit Default Values of Agent Corporate Entity
+    Given an Agent Corporate Entity has been created
+      And the user is on the Agents page
      When the user clicks on 'Edit Default Values'
       And the user clicks on 'Corporate Entity' in the dropdown menu
       And the user clicks on 'Other Agency Codes'
@@ -41,10 +42,12 @@ Feature: Agent Edit Default Values
       And the user fills in 'Maintenance Agency' with 'Test Agency'
       And the user clicks on 'Save Corporate Entity'
      Then the 'Defaults' updated message is displayed
-      And the new Agent type Corporate Entity form has the following default values
-       | form_section       | form_field         | form_value  |
-       | Other Agency Codes | Maintenance Agency | Test Agency |
-  Scenario: Edit Default Values of Agent type Software
+      And the new Agent Corporate Entity form has the following default values
+        | form_section       | form_field         | form_value  |
+        | Other Agency Codes | Maintenance Agency | Test Agency |
+  Scenario: Edit Default Values of Agent Software
+    Given an Agent Software has been created
+      And the user is on the Agents page
      When the user clicks on 'Edit Default Values'
       And the user clicks on 'Software' in the dropdown menu
       And the user clicks on 'Contact Details'
@@ -52,7 +55,6 @@ Feature: Agent Edit Default Values
       And the user fills in 'Contact Name' with 'Test Contact'
       And the user clicks on 'Save Software'
      Then the 'Defaults' updated message is displayed
-      And the new Agent type Corporate Entity form has the following default values
-       | form_section    | form_field   | form_value   |
-       | Contact Details | Contact Name | Test Contact |
-    
\ No newline at end of file
+      And the new Agent Corporate Entity form has the following default values
+        | form_section    | form_field   | form_value   |
+        | Contact Details | Contact Name | Test Contact |