diff --git a/testing/equivalence-tests/outputs/basic_collections/apply.json b/testing/equivalence-tests/outputs/basic_collections/apply.json
index f39634c3c5..5874c55471 100644
--- a/testing/equivalence-tests/outputs/basic_collections/apply.json
+++ b/testing/equivalence-tests/outputs/basic_collections/apply.json
@@ -17,24 +17,6 @@
     },
     "type": "planned_change"
   },
-  {
-    "@level": "info",
-    "@message": "tfcoremock_set.set: Plan to create",
-    "@module": "terraform.ui",
-    "change": {
-      "action": "create",
-      "resource": {
-        "addr": "tfcoremock_set.set",
-        "implied_provider": "tfcoremock",
-        "module": "",
-        "resource": "tfcoremock_set.set",
-        "resource_key": null,
-        "resource_name": "set",
-        "resource_type": "tfcoremock_set"
-      }
-    },
-    "type": "planned_change"
-  },
   {
     "@level": "info",
     "@message": "tfcoremock_list.list: Plan to create",
@@ -55,21 +37,21 @@
   },
   {
     "@level": "info",
-    "@message": "tfcoremock_list.list: Creating...",
+    "@message": "tfcoremock_set.set: Plan to create",
     "@module": "terraform.ui",
-    "hook": {
+    "change": {
       "action": "create",
       "resource": {
-        "addr": "tfcoremock_list.list",
+        "addr": "tfcoremock_set.set",
         "implied_provider": "tfcoremock",
         "module": "",
-        "resource": "tfcoremock_list.list",
+        "resource": "tfcoremock_set.set",
         "resource_key": null,
-        "resource_name": "list",
-        "resource_type": "tfcoremock_list"
+        "resource_name": "set",
+        "resource_type": "tfcoremock_set"
       }
     },
-    "type": "apply_start"
+    "type": "planned_change"
   },
   {
     "@level": "info",
@@ -107,6 +89,45 @@
     },
     "type": "apply_start"
   },
+  {
+    "@level": "info",
+    "@message": "tfcoremock_list.list: Creating...",
+    "@module": "terraform.ui",
+    "hook": {
+      "action": "create",
+      "resource": {
+        "addr": "tfcoremock_list.list",
+        "implied_provider": "tfcoremock",
+        "module": "",
+        "resource": "tfcoremock_list.list",
+        "resource_key": null,
+        "resource_name": "list",
+        "resource_type": "tfcoremock_list"
+      }
+    },
+    "type": "apply_start"
+  },
+  {
+    "@level": "info",
+    "@message": "tfcoremock_list.list: Creation complete after 0s [id=985820B3-ACF9-4F00-94AD-F81C5EA33663]",
+    "@module": "terraform.ui",
+    "hook": {
+      "action": "create",
+      "elapsed_seconds": 0,
+      "id_key": "id",
+      "id_value": "985820B3-ACF9-4F00-94AD-F81C5EA33663",
+      "resource": {
+        "addr": "tfcoremock_list.list",
+        "implied_provider": "tfcoremock",
+        "module": "",
+        "resource": "tfcoremock_list.list",
+        "resource_key": null,
+        "resource_name": "list",
+        "resource_type": "tfcoremock_list"
+      }
+    },
+    "type": "apply_complete"
+  },
   {
     "@level": "info",
     "@message": "tfcoremock_map.map: Creation complete after 0s [id=50E1A46E-E64A-4C1F-881C-BA85A5440964]",
@@ -149,27 +170,6 @@
     },
     "type": "apply_complete"
   },
-  {
-    "@level": "info",
-    "@message": "tfcoremock_list.list: Creation complete after 0s [id=985820B3-ACF9-4F00-94AD-F81C5EA33663]",
-    "@module": "terraform.ui",
-    "hook": {
-      "action": "create",
-      "elapsed_seconds": 0,
-      "id_key": "id",
-      "id_value": "985820B3-ACF9-4F00-94AD-F81C5EA33663",
-      "resource": {
-        "addr": "tfcoremock_list.list",
-        "implied_provider": "tfcoremock",
-        "module": "",
-        "resource": "tfcoremock_list.list",
-        "resource_key": null,
-        "resource_name": "list",
-        "resource_type": "tfcoremock_list"
-      }
-    },
-    "type": "apply_complete"
-  },
   {
     "@level": "info",
     "@message": "Apply complete! Resources: 3 added, 0 changed, 0 destroyed.",
diff --git a/testing/equivalence-tests/outputs/basic_collections_empty/apply.json b/testing/equivalence-tests/outputs/basic_collections_empty/apply.json
index 5947910d16..fd44e0e992 100644
--- a/testing/equivalence-tests/outputs/basic_collections_empty/apply.json
+++ b/testing/equivalence-tests/outputs/basic_collections_empty/apply.json
@@ -1,4 +1,22 @@
 [
+  {
+    "@level": "info",
+    "@message": "tfcoremock_set.set: Plan to update",
+    "@module": "terraform.ui",
+    "change": {
+      "action": "update",
+      "resource": {
+        "addr": "tfcoremock_set.set",
+        "implied_provider": "tfcoremock",
+        "module": "",
+        "resource": "tfcoremock_set.set",
+        "resource_key": null,
+        "resource_name": "set",
+        "resource_type": "tfcoremock_set"
+      }
+    },
+    "type": "planned_change"
+  },
   {
     "@level": "info",
     "@message": "tfcoremock_list.list: Plan to update",
@@ -35,44 +53,6 @@
     },
     "type": "planned_change"
   },
-  {
-    "@level": "info",
-    "@message": "tfcoremock_set.set: Plan to update",
-    "@module": "terraform.ui",
-    "change": {
-      "action": "update",
-      "resource": {
-        "addr": "tfcoremock_set.set",
-        "implied_provider": "tfcoremock",
-        "module": "",
-        "resource": "tfcoremock_set.set",
-        "resource_key": null,
-        "resource_name": "set",
-        "resource_type": "tfcoremock_set"
-      }
-    },
-    "type": "planned_change"
-  },
-  {
-    "@level": "info",
-    "@message": "tfcoremock_map.map: Modifying... [id=50E1A46E-E64A-4C1F-881C-BA85A5440964]",
-    "@module": "terraform.ui",
-    "hook": {
-      "action": "update",
-      "id_key": "id",
-      "id_value": "50E1A46E-E64A-4C1F-881C-BA85A5440964",
-      "resource": {
-        "addr": "tfcoremock_map.map",
-        "implied_provider": "tfcoremock",
-        "module": "",
-        "resource": "tfcoremock_map.map",
-        "resource_key": null,
-        "resource_name": "map",
-        "resource_type": "tfcoremock_map"
-      }
-    },
-    "type": "apply_start"
-  },
   {
     "@level": "info",
     "@message": "tfcoremock_list.list: Modifying... [id=985820B3-ACF9-4F00-94AD-F81C5EA33663]",
@@ -93,6 +73,27 @@
     },
     "type": "apply_start"
   },
+  {
+    "@level": "info",
+    "@message": "tfcoremock_list.list: Modifications complete after 0s [id=985820B3-ACF9-4F00-94AD-F81C5EA33663]",
+    "@module": "terraform.ui",
+    "hook": {
+      "action": "update",
+      "elapsed_seconds": 0,
+      "id_key": "id",
+      "id_value": "985820B3-ACF9-4F00-94AD-F81C5EA33663",
+      "resource": {
+        "addr": "tfcoremock_list.list",
+        "implied_provider": "tfcoremock",
+        "module": "",
+        "resource": "tfcoremock_list.list",
+        "resource_key": null,
+        "resource_name": "list",
+        "resource_type": "tfcoremock_list"
+      }
+    },
+    "type": "apply_complete"
+  },
   {
     "@level": "info",
     "@message": "tfcoremock_set.set: Modifying... [id=046952C9-B832-4106-82C0-C217F7C73E18]",
@@ -113,6 +114,47 @@
     },
     "type": "apply_start"
   },
+  {
+    "@level": "info",
+    "@message": "tfcoremock_set.set: Modifications complete after 0s [id=046952C9-B832-4106-82C0-C217F7C73E18]",
+    "@module": "terraform.ui",
+    "hook": {
+      "action": "update",
+      "elapsed_seconds": 0,
+      "id_key": "id",
+      "id_value": "046952C9-B832-4106-82C0-C217F7C73E18",
+      "resource": {
+        "addr": "tfcoremock_set.set",
+        "implied_provider": "tfcoremock",
+        "module": "",
+        "resource": "tfcoremock_set.set",
+        "resource_key": null,
+        "resource_name": "set",
+        "resource_type": "tfcoremock_set"
+      }
+    },
+    "type": "apply_complete"
+  },
+  {
+    "@level": "info",
+    "@message": "tfcoremock_map.map: Modifying... [id=50E1A46E-E64A-4C1F-881C-BA85A5440964]",
+    "@module": "terraform.ui",
+    "hook": {
+      "action": "update",
+      "id_key": "id",
+      "id_value": "50E1A46E-E64A-4C1F-881C-BA85A5440964",
+      "resource": {
+        "addr": "tfcoremock_map.map",
+        "implied_provider": "tfcoremock",
+        "module": "",
+        "resource": "tfcoremock_map.map",
+        "resource_key": null,
+        "resource_name": "map",
+        "resource_type": "tfcoremock_map"
+      }
+    },
+    "type": "apply_start"
+  },
   {
     "@level": "info",
     "@message": "tfcoremock_map.map: Modifications complete after 0s [id=50E1A46E-E64A-4C1F-881C-BA85A5440964]",
@@ -134,48 +176,6 @@
     },
     "type": "apply_complete"
   },
-  {
-    "@level": "info",
-    "@message": "tfcoremock_set.set: Modifications complete after 0s [id=046952C9-B832-4106-82C0-C217F7C73E18]",
-    "@module": "terraform.ui",
-    "hook": {
-      "action": "update",
-      "elapsed_seconds": 0,
-      "id_key": "id",
-      "id_value": "046952C9-B832-4106-82C0-C217F7C73E18",
-      "resource": {
-        "addr": "tfcoremock_set.set",
-        "implied_provider": "tfcoremock",
-        "module": "",
-        "resource": "tfcoremock_set.set",
-        "resource_key": null,
-        "resource_name": "set",
-        "resource_type": "tfcoremock_set"
-      }
-    },
-    "type": "apply_complete"
-  },
-  {
-    "@level": "info",
-    "@message": "tfcoremock_list.list: Modifications complete after 0s [id=985820B3-ACF9-4F00-94AD-F81C5EA33663]",
-    "@module": "terraform.ui",
-    "hook": {
-      "action": "update",
-      "elapsed_seconds": 0,
-      "id_key": "id",
-      "id_value": "985820B3-ACF9-4F00-94AD-F81C5EA33663",
-      "resource": {
-        "addr": "tfcoremock_list.list",
-        "implied_provider": "tfcoremock",
-        "module": "",
-        "resource": "tfcoremock_list.list",
-        "resource_key": null,
-        "resource_name": "list",
-        "resource_type": "tfcoremock_list"
-      }
-    },
-    "type": "apply_complete"
-  },
   {
     "@level": "info",
     "@message": "Apply complete! Resources: 0 added, 3 changed, 0 destroyed.",
diff --git a/testing/equivalence-tests/outputs/basic_collections_empty/plan b/testing/equivalence-tests/outputs/basic_collections_empty/plan
index 318f2b4faa..a1d0165eed 100644
--- a/testing/equivalence-tests/outputs/basic_collections_empty/plan
+++ b/testing/equivalence-tests/outputs/basic_collections_empty/plan
@@ -1,6 +1,6 @@
-tfcoremock_list.list: Refreshing state... [id=985820B3-ACF9-4F00-94AD-F81C5EA33663]
 tfcoremock_set.set: Refreshing state... [id=046952C9-B832-4106-82C0-C217F7C73E18]
 tfcoremock_map.map: Refreshing state... [id=50E1A46E-E64A-4C1F-881C-BA85A5440964]
+tfcoremock_list.list: Refreshing state... [id=985820B3-ACF9-4F00-94AD-F81C5EA33663]
 
 Terraform used the selected providers to generate the following execution
 plan. Resource actions are indicated with the following symbols:
diff --git a/testing/equivalence-tests/outputs/basic_collections_null/apply.json b/testing/equivalence-tests/outputs/basic_collections_null/apply.json
index fd3774cecc..224efdce23 100644
--- a/testing/equivalence-tests/outputs/basic_collections_null/apply.json
+++ b/testing/equivalence-tests/outputs/basic_collections_null/apply.json
@@ -1,4 +1,22 @@
 [
+  {
+    "@level": "info",
+    "@message": "tfcoremock_set.set: Plan to update",
+    "@module": "terraform.ui",
+    "change": {
+      "action": "update",
+      "resource": {
+        "addr": "tfcoremock_set.set",
+        "implied_provider": "tfcoremock",
+        "module": "",
+        "resource": "tfcoremock_set.set",
+        "resource_key": null,
+        "resource_name": "set",
+        "resource_type": "tfcoremock_set"
+      }
+    },
+    "type": "planned_change"
+  },
   {
     "@level": "info",
     "@message": "tfcoremock_list.list: Plan to update",
@@ -37,10 +55,12 @@
   },
   {
     "@level": "info",
-    "@message": "tfcoremock_set.set: Plan to update",
+    "@message": "tfcoremock_set.set: Modifying... [id=046952C9-B832-4106-82C0-C217F7C73E18]",
     "@module": "terraform.ui",
-    "change": {
+    "hook": {
       "action": "update",
+      "id_key": "id",
+      "id_value": "046952C9-B832-4106-82C0-C217F7C73E18",
       "resource": {
         "addr": "tfcoremock_set.set",
         "implied_provider": "tfcoremock",
@@ -51,7 +71,28 @@
         "resource_type": "tfcoremock_set"
       }
     },
-    "type": "planned_change"
+    "type": "apply_start"
+  },
+  {
+    "@level": "info",
+    "@message": "tfcoremock_set.set: Modifications complete after 0s [id=046952C9-B832-4106-82C0-C217F7C73E18]",
+    "@module": "terraform.ui",
+    "hook": {
+      "action": "update",
+      "elapsed_seconds": 0,
+      "id_key": "id",
+      "id_value": "046952C9-B832-4106-82C0-C217F7C73E18",
+      "resource": {
+        "addr": "tfcoremock_set.set",
+        "implied_provider": "tfcoremock",
+        "module": "",
+        "resource": "tfcoremock_set.set",
+        "resource_key": null,
+        "resource_name": "set",
+        "resource_type": "tfcoremock_set"
+      }
+    },
+    "type": "apply_complete"
   },
   {
     "@level": "info",
@@ -73,26 +114,6 @@
     },
     "type": "apply_start"
   },
-  {
-    "@level": "info",
-    "@message": "tfcoremock_set.set: Modifying... [id=046952C9-B832-4106-82C0-C217F7C73E18]",
-    "@module": "terraform.ui",
-    "hook": {
-      "action": "update",
-      "id_key": "id",
-      "id_value": "046952C9-B832-4106-82C0-C217F7C73E18",
-      "resource": {
-        "addr": "tfcoremock_set.set",
-        "implied_provider": "tfcoremock",
-        "module": "",
-        "resource": "tfcoremock_set.set",
-        "resource_key": null,
-        "resource_name": "set",
-        "resource_type": "tfcoremock_set"
-      }
-    },
-    "type": "apply_start"
-  },
   {
     "@level": "info",
     "@message": "tfcoremock_list.list: Modifying... [id=985820B3-ACF9-4F00-94AD-F81C5EA33663]",
@@ -134,27 +155,6 @@
     },
     "type": "apply_complete"
   },
-  {
-    "@level": "info",
-    "@message": "tfcoremock_set.set: Modifications complete after 0s [id=046952C9-B832-4106-82C0-C217F7C73E18]",
-    "@module": "terraform.ui",
-    "hook": {
-      "action": "update",
-      "elapsed_seconds": 0,
-      "id_key": "id",
-      "id_value": "046952C9-B832-4106-82C0-C217F7C73E18",
-      "resource": {
-        "addr": "tfcoremock_set.set",
-        "implied_provider": "tfcoremock",
-        "module": "",
-        "resource": "tfcoremock_set.set",
-        "resource_key": null,
-        "resource_name": "set",
-        "resource_type": "tfcoremock_set"
-      }
-    },
-    "type": "apply_complete"
-  },
   {
     "@level": "info",
     "@message": "tfcoremock_map.map: Modifications complete after 0s [id=50E1A46E-E64A-4C1F-881C-BA85A5440964]",
diff --git a/testing/equivalence-tests/outputs/basic_collections_null/plan b/testing/equivalence-tests/outputs/basic_collections_null/plan
index a817764734..0c55ca8b68 100644
--- a/testing/equivalence-tests/outputs/basic_collections_null/plan
+++ b/testing/equivalence-tests/outputs/basic_collections_null/plan
@@ -1,6 +1,6 @@
-tfcoremock_list.list: Refreshing state... [id=985820B3-ACF9-4F00-94AD-F81C5EA33663]
 tfcoremock_set.set: Refreshing state... [id=046952C9-B832-4106-82C0-C217F7C73E18]
 tfcoremock_map.map: Refreshing state... [id=50E1A46E-E64A-4C1F-881C-BA85A5440964]
+tfcoremock_list.list: Refreshing state... [id=985820B3-ACF9-4F00-94AD-F81C5EA33663]
 
 Terraform used the selected providers to generate the following execution
 plan. Resource actions are indicated with the following symbols:
diff --git a/testing/equivalence-tests/outputs/basic_collections_update/apply.json b/testing/equivalence-tests/outputs/basic_collections_update/apply.json
index ff28ba18f8..8fdfadf2a8 100644
--- a/testing/equivalence-tests/outputs/basic_collections_update/apply.json
+++ b/testing/equivalence-tests/outputs/basic_collections_update/apply.json
@@ -17,24 +17,6 @@
     },
     "type": "planned_change"
   },
-  {
-    "@level": "info",
-    "@message": "tfcoremock_list.list: Plan to update",
-    "@module": "terraform.ui",
-    "change": {
-      "action": "update",
-      "resource": {
-        "addr": "tfcoremock_list.list",
-        "implied_provider": "tfcoremock",
-        "module": "",
-        "resource": "tfcoremock_list.list",
-        "resource_key": null,
-        "resource_name": "list",
-        "resource_type": "tfcoremock_list"
-      }
-    },
-    "type": "planned_change"
-  },
   {
     "@level": "info",
     "@message": "tfcoremock_set.set: Plan to update",
@@ -55,12 +37,10 @@
   },
   {
     "@level": "info",
-    "@message": "tfcoremock_list.list: Modifying... [id=985820B3-ACF9-4F00-94AD-F81C5EA33663]",
+    "@message": "tfcoremock_list.list: Plan to update",
     "@module": "terraform.ui",
-    "hook": {
+    "change": {
       "action": "update",
-      "id_key": "id",
-      "id_value": "985820B3-ACF9-4F00-94AD-F81C5EA33663",
       "resource": {
         "addr": "tfcoremock_list.list",
         "implied_provider": "tfcoremock",
@@ -71,7 +51,7 @@
         "resource_type": "tfcoremock_list"
       }
     },
-    "type": "apply_start"
+    "type": "planned_change"
   },
   {
     "@level": "info",
@@ -136,11 +116,10 @@
   },
   {
     "@level": "info",
-    "@message": "tfcoremock_list.list: Modifications complete after 0s [id=985820B3-ACF9-4F00-94AD-F81C5EA33663]",
+    "@message": "tfcoremock_list.list: Modifying... [id=985820B3-ACF9-4F00-94AD-F81C5EA33663]",
     "@module": "terraform.ui",
     "hook": {
       "action": "update",
-      "elapsed_seconds": 0,
       "id_key": "id",
       "id_value": "985820B3-ACF9-4F00-94AD-F81C5EA33663",
       "resource": {
@@ -153,7 +132,7 @@
         "resource_type": "tfcoremock_list"
       }
     },
-    "type": "apply_complete"
+    "type": "apply_start"
   },
   {
     "@level": "info",
@@ -176,6 +155,27 @@
     },
     "type": "apply_complete"
   },
+  {
+    "@level": "info",
+    "@message": "tfcoremock_list.list: Modifications complete after 0s [id=985820B3-ACF9-4F00-94AD-F81C5EA33663]",
+    "@module": "terraform.ui",
+    "hook": {
+      "action": "update",
+      "elapsed_seconds": 0,
+      "id_key": "id",
+      "id_value": "985820B3-ACF9-4F00-94AD-F81C5EA33663",
+      "resource": {
+        "addr": "tfcoremock_list.list",
+        "implied_provider": "tfcoremock",
+        "module": "",
+        "resource": "tfcoremock_list.list",
+        "resource_key": null,
+        "resource_name": "list",
+        "resource_type": "tfcoremock_list"
+      }
+    },
+    "type": "apply_complete"
+  },
   {
     "@level": "info",
     "@message": "Apply complete! Resources: 0 added, 3 changed, 0 destroyed.",
diff --git a/testing/equivalence-tests/outputs/basic_collections_update/plan b/testing/equivalence-tests/outputs/basic_collections_update/plan
index 6725c24a96..e4284aa9ac 100644
--- a/testing/equivalence-tests/outputs/basic_collections_update/plan
+++ b/testing/equivalence-tests/outputs/basic_collections_update/plan
@@ -1,6 +1,6 @@
-tfcoremock_set.set: Refreshing state... [id=046952C9-B832-4106-82C0-C217F7C73E18]
-tfcoremock_list.list: Refreshing state... [id=985820B3-ACF9-4F00-94AD-F81C5EA33663]
 tfcoremock_map.map: Refreshing state... [id=50E1A46E-E64A-4C1F-881C-BA85A5440964]
+tfcoremock_list.list: Refreshing state... [id=985820B3-ACF9-4F00-94AD-F81C5EA33663]
+tfcoremock_set.set: Refreshing state... [id=046952C9-B832-4106-82C0-C217F7C73E18]
 
 Terraform used the selected providers to generate the following execution
 plan. Resource actions are indicated with the following symbols: