diff --git a/source/server-discovery-and-monitoring/tests/unified/loadbalanced-emit-topology-changed-before-close.json b/source/server-discovery-and-monitoring/tests/unified/loadbalanced-emit-topology-changed-before-close.json
index 5a85ddd4ad..869857f1ae 100644
--- a/source/server-discovery-and-monitoring/tests/unified/loadbalanced-emit-topology-changed-before-close.json
+++ b/source/server-discovery-and-monitoring/tests/unified/loadbalanced-emit-topology-changed-before-close.json
@@ -1,6 +1,6 @@
 {
   "description": "loadbalanced-emit-topology-description-changed-before-close",
-  "schemaVersion": "1.17",
+  "schemaVersion": "1.19",
   "runOnRequirements": [
     {
       "topologies": [
@@ -60,7 +60,7 @@
                 "previousDescription": {
                   "type": "Unknown"
                 },
-                "currentDescription": {}
+                "newDescription": {}
               }
             },
             {
diff --git a/source/server-discovery-and-monitoring/tests/unified/loadbalanced-emit-topology-changed-before-close.yml b/source/server-discovery-and-monitoring/tests/unified/loadbalanced-emit-topology-changed-before-close.yml
index 529f3ede84..72217c85eb 100644
--- a/source/server-discovery-and-monitoring/tests/unified/loadbalanced-emit-topology-changed-before-close.yml
+++ b/source/server-discovery-and-monitoring/tests/unified/loadbalanced-emit-topology-changed-before-close.yml
@@ -1,6 +1,6 @@
 description: "loadbalanced-emit-topology-description-changed-before-close"
 
-schemaVersion: "1.17"
+schemaVersion: "1.19"
 
 runOnRequirements:
   - topologies:
@@ -39,7 +39,7 @@ tests:
           - topologyDescriptionChangedEvent: # unknown -> unknown w disconnected server
               previousDescription: 
                 type: "Unknown"
-              currentDescription: {}
+              newDescription: {}
           - topologyDescriptionChangedEvent:  # unknown w disconnected server -> loadBalanced
               newDescription:
                 type: "LoadBalanced"
diff --git a/source/server-discovery-and-monitoring/tests/unified/replicaset-emit-topology-changed-before-close.json b/source/server-discovery-and-monitoring/tests/unified/replicaset-emit-topology-changed-before-close.json
index 1f15c188e0..f3378bf8a6 100644
--- a/source/server-discovery-and-monitoring/tests/unified/replicaset-emit-topology-changed-before-close.json
+++ b/source/server-discovery-and-monitoring/tests/unified/replicaset-emit-topology-changed-before-close.json
@@ -1,6 +1,6 @@
 {
   "description": "replicaset-emit-topology-description-changed-before-close",
-  "schemaVersion": "1.17",
+  "schemaVersion": "1.19",
   "runOnRequirements": [
     {
       "topologies": [
@@ -57,44 +57,16 @@
               "topologyOpeningEvent": {}
             },
             {
-              "topologyDescriptionChangedEvent": {
-                "previousDescription": {
-                  "type": "Unknown"
-                },
-                "newDescription": {
-                  "type": "ReplicaSetNoPrimary"
-                }
-              }
+              "topologyDescriptionChangedEvent": {}
             },
             {
-              "topologyDescriptionChangedEvent": {
-                "previousDescription": {
-                  "type": "ReplicaSetNoPrimary"
-                },
-                "newDescription": {
-                  "type": "ReplicaSetWithPrimary"
-                }
-              }
+              "topologyDescriptionChangedEvent": {}
             },
             {
-              "topologyDescriptionChangedEvent": {
-                "previousDescription": {
-                  "type": "ReplicaSetWithPrimary"
-                },
-                "newDescription": {
-                  "type": "ReplicaSetWithPrimary"
-                }
-              }
+              "topologyDescriptionChangedEvent": {}
             },
             {
-              "topologyDescriptionChangedEvent": {
-                "previousDescription": {
-                  "type": "ReplicaSetWithPrimary"
-                },
-                "newDescription": {
-                  "type": "ReplicaSetWithPrimary"
-                }
-              }
+              "topologyDescriptionChangedEvent": {}
             },
             {
               "topologyDescriptionChangedEvent": {
diff --git a/source/server-discovery-and-monitoring/tests/unified/replicaset-emit-topology-changed-before-close.yml b/source/server-discovery-and-monitoring/tests/unified/replicaset-emit-topology-changed-before-close.yml
index c06e52d4a9..ee49303cad 100644
--- a/source/server-discovery-and-monitoring/tests/unified/replicaset-emit-topology-changed-before-close.yml
+++ b/source/server-discovery-and-monitoring/tests/unified/replicaset-emit-topology-changed-before-close.yml
@@ -1,6 +1,6 @@
 description: "replicaset-emit-topology-description-changed-before-close"
 
-schemaVersion: "1.17"
+schemaVersion: "1.19"
 
 runOnRequirements:
   - topologies:
@@ -37,26 +37,10 @@ tests:
         ignoreExtraEvents: false
         events:
           - topologyOpeningEvent: {}
-          - topologyDescriptionChangedEvent: # unknown -> replset no primary
-              previousDescription: 
-                type: "Unknown"
-              newDescription:
-                type: "ReplicaSetNoPrimary"
-          - topologyDescriptionChangedEvent:  # server connected
-              previousDescription:
-                type: "ReplicaSetNoPrimary"
-              newDescription:
-                type: "ReplicaSetWithPrimary"
-          - topologyDescriptionChangedEvent:  # server connected
-              previousDescription:
-                type: "ReplicaSetWithPrimary"
-              newDescription:
-                type: "ReplicaSetWithPrimary"
-          - topologyDescriptionChangedEvent:  # server connected
-              previousDescription:
-                type: "ReplicaSetWithPrimary"
-              newDescription:
-                type: "ReplicaSetWithPrimary"
+          - topologyDescriptionChangedEvent: {} # unknown -> replset no primary
+          - topologyDescriptionChangedEvent: {} # server connected
+          - topologyDescriptionChangedEvent: {} # server connected
+          - topologyDescriptionChangedEvent: {} # server connected
           - topologyDescriptionChangedEvent:  # replicaset -> unknown
               previousDescription:
                 type: "ReplicaSetWithPrimary"
diff --git a/source/server-discovery-and-monitoring/tests/unified/sharded-emit-topology-changed-before-close.json b/source/server-discovery-and-monitoring/tests/unified/sharded-emit-topology-changed-before-close.json
index 60a9d5b052..3ee615ec66 100644
--- a/source/server-discovery-and-monitoring/tests/unified/sharded-emit-topology-changed-before-close.json
+++ b/source/server-discovery-and-monitoring/tests/unified/sharded-emit-topology-changed-before-close.json
@@ -1,6 +1,6 @@
 {
   "description": "sharded-emit-topology-description-changed-before-close",
-  "schemaVersion": "1.17",
+  "schemaVersion": "1.19",
   "runOnRequirements": [
     {
       "topologies": [
diff --git a/source/server-discovery-and-monitoring/tests/unified/sharded-emit-topology-changed-before-close.yml b/source/server-discovery-and-monitoring/tests/unified/sharded-emit-topology-changed-before-close.yml
index 0aef73b14b..e890794c1d 100644
--- a/source/server-discovery-and-monitoring/tests/unified/sharded-emit-topology-changed-before-close.yml
+++ b/source/server-discovery-and-monitoring/tests/unified/sharded-emit-topology-changed-before-close.yml
@@ -1,6 +1,6 @@
 description: "sharded-emit-topology-description-changed-before-close"
 
-schemaVersion: "1.17"
+schemaVersion: "1.19"
 
 runOnRequirements:
   - topologies:
diff --git a/source/server-discovery-and-monitoring/tests/unified/standalone-emit-topology-changed-before-close.json b/source/server-discovery-and-monitoring/tests/unified/standalone-emit-topology-changed-before-close.json
index 03c501d7cf..d86d321b12 100644
--- a/source/server-discovery-and-monitoring/tests/unified/standalone-emit-topology-changed-before-close.json
+++ b/source/server-discovery-and-monitoring/tests/unified/standalone-emit-topology-changed-before-close.json
@@ -1,6 +1,6 @@
 {
   "description": "standalone-emit-topology-description-changed-before-close",
-  "schemaVersion": "1.17",
+  "schemaVersion": "1.19",
   "runOnRequirements": [
     {
       "topologies": [
@@ -24,9 +24,7 @@
                   "observeEvents": [
                     "topologyDescriptionChangedEvent",
                     "topologyOpeningEvent",
-                    "topologyClosedEvent",
-                    "serverOpeningEvent",
-                    "serverClosedEvent"
+                    "topologyClosedEvent"
                   ]
                 }
               }
@@ -68,9 +66,6 @@
                 }
               }
             },
-            {
-              "serverOpeningEvent": {}
-            },
             {
               "topologyDescriptionChangedEvent": {
                 "previousDescription": {
@@ -81,9 +76,6 @@
                 }
               }
             },
-            {
-              "serverClosedEvent": {}
-            },
             {
               "topologyDescriptionChangedEvent": {
                 "previousDescription": {
diff --git a/source/server-discovery-and-monitoring/tests/unified/standalone-emit-topology-changed-before-close.yml b/source/server-discovery-and-monitoring/tests/unified/standalone-emit-topology-changed-before-close.yml
index 2332decfc6..9563482134 100644
--- a/source/server-discovery-and-monitoring/tests/unified/standalone-emit-topology-changed-before-close.yml
+++ b/source/server-discovery-and-monitoring/tests/unified/standalone-emit-topology-changed-before-close.yml
@@ -1,6 +1,6 @@
 description: "standalone-emit-topology-description-changed-before-close"
 
-schemaVersion: "1.17"
+schemaVersion: "1.19"
 
 runOnRequirements:
   - topologies:
@@ -20,8 +20,6 @@ tests:
                   - topologyDescriptionChangedEvent
                   - topologyOpeningEvent
                   - topologyClosedEvent
-                  - serverOpeningEvent
-                  - serverClosedEvent
       # ensure the topology has been fully discovered before closing the client.
       # expected events are initial server discovery and server connect event.
       - name: waitForEvent
@@ -44,13 +42,11 @@ tests:
                 type: "Unknown"
               newDescription: 
                 type: "Unknown"
-          - serverOpeningEvent: {}
           - topologyDescriptionChangedEvent:  # unknown w disconnected server -> standalone 
               previousDescription:
                 type: "Unknown"
               newDescription:
                 type: "Single"
-          - serverClosedEvent: {}
           - topologyDescriptionChangedEvent:  # standalone -> unknown
               previousDescription:
                 type: "Single"