diff --git a/test/connection_monitoring/pool-create-min-size-error.json b/test/connection_monitoring/pool-create-min-size-error.json
index 5c8ad02db..1c744b850 100644
--- a/test/connection_monitoring/pool-create-min-size-error.json
+++ b/test/connection_monitoring/pool-create-min-size-error.json
@@ -17,7 +17,7 @@
         "isMaster",
         "hello"
       ],
-      "errorCode": 91,
+      "closeConnection": true,
       "appName": "poolCreateMinSizeErrorTest"
     }
   },
diff --git a/test/discovery_and_monitoring/errors/error_handling_handshake.json b/test/discovery_and_monitoring/errors/error_handling_handshake.json
index bf83f46f6..56ca7d113 100644
--- a/test/discovery_and_monitoring/errors/error_handling_handshake.json
+++ b/test/discovery_and_monitoring/errors/error_handling_handshake.json
@@ -97,22 +97,14 @@
       "outcome": {
         "servers": {
           "a:27017": {
-            "type": "RSPrimary",
-            "setName": "rs",
-            "topologyVersion": {
-              "processId": {
-                "$oid": "000000000000000000000001"
-              },
-              "counter": {
-                "$numberLong": "1"
-              }
-            },
+            "type": "Unknown",
+            "topologyVersion": null,
             "pool": {
-              "generation": 0
+              "generation": 1
             }
           }
         },
-        "topologyType": "ReplicaSetWithPrimary",
+        "topologyType": "ReplicaSetNoPrimary",
         "logicalSessionTimeoutMinutes": null,
         "setName": "rs"
       }
diff --git a/test/discovery_and_monitoring/unified/backpressure-network-error-fail.json b/test/discovery_and_monitoring/unified/backpressure-network-error-fail.json
deleted file mode 100644
index f41b76459..000000000
--- a/test/discovery_and_monitoring/unified/backpressure-network-error-fail.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "description": "backpressure-network-error-fail",
-  "schemaVersion": "1.17",
-  "runOnRequirements": [
-    {
-      "minServerVersion": "4.4",
-      "serverless": "forbid",
-      "topologies": [
-        "single",
-        "replicaset",
-        "sharded"
-      ]
-    }
-  ],
-  "createEntities": [
-    {
-      "client": {
-        "id": "setupClient",
-        "useMultipleMongoses": false
-      }
-    }
-  ],
-  "initialData": [
-    {
-      "collectionName": "backpressure-network-error-fail",
-      "databaseName": "sdam-tests",
-      "documents": [
-        {
-          "_id": 1
-        },
-        {
-          "_id": 2
-        }
-      ]
-    }
-  ],
-  "tests": [
-    {
-      "description": "apply backpressure on network connection errors during connection establishment",
-      "operations": [
-        {
-          "name": "createEntities",
-          "object": "testRunner",
-          "arguments": {
-            "entities": [
-              {
-                "client": {
-                  "id": "client",
-                  "useMultipleMongoses": false,
-                  "observeEvents": [
-                    "serverHeartbeatSucceededEvent",
-                    "poolClearedEvent"
-                  ],
-                  "uriOptions": {
-                    "retryWrites": false,
-                    "heartbeatFrequencyMS": 1000000,
-                    "serverMonitoringMode": "poll",
-                    "appname": "backpressureNetworkErrorFailTest"
-                  }
-                }
-              },
-              {
-                "database": {
-                  "id": "database",
-                  "client": "client",
-                  "databaseName": "sdam-tests"
-                }
-              },
-              {
-                "collection": {
-                  "id": "collection",
-                  "database": "database",
-                  "collectionName": "backpressure-network-error-fail"
-                }
-              }
-            ]
-          }
-        },
-        {
-          "name": "waitForEvent",
-          "object": "testRunner",
-          "arguments": {
-            "client": "client",
-            "event": {
-              "serverHeartbeatSucceededEvent": {}
-            },
-            "count": 1
-          }
-        },
-        {
-          "name": "failPoint",
-          "object": "testRunner",
-          "arguments": {
-            "client": "setupClient",
-            "failPoint": {
-              "configureFailPoint": "failCommand",
-              "mode": "alwaysOn",
-              "data": {
-                "failCommands": [
-                  "isMaster",
-                  "hello"
-                ],
-                "appName": "backpressureNetworkErrorFailTest",
-                "closeConnection": true
-              }
-            }
-          }
-        },
-        {
-          "name": "insertMany",
-          "object": "collection",
-          "arguments": {
-            "documents": [
-              {
-                "_id": 3
-              },
-              {
-                "_id": 4
-              }
-            ]
-          },
-          "expectError": {
-            "isError": true,
-            "errorLabelsContain": [
-              "SystemOverloadedError",
-              "RetryableError"
-            ]
-          }
-        }
-      ],
-      "expectEvents": [
-        {
-          "client": "client",
-          "eventType": "cmap",
-          "events": []
-        }
-      ]
-    }
-  ]
-}
diff --git a/test/discovery_and_monitoring/unified/backpressure-network-timeout-fail.json b/test/discovery_and_monitoring/unified/backpressure-network-timeout-fail.json
deleted file mode 100644
index a97c7a329..000000000
--- a/test/discovery_and_monitoring/unified/backpressure-network-timeout-fail.json
+++ /dev/null
@@ -1,143 +0,0 @@
-{
-  "description": "backpressure-network-timeout-error",
-  "schemaVersion": "1.17",
-  "runOnRequirements": [
-    {
-      "minServerVersion": "4.4",
-      "serverless": "forbid",
-      "topologies": [
-        "single",
-        "replicaset",
-        "sharded"
-      ]
-    }
-  ],
-  "createEntities": [
-    {
-      "client": {
-        "id": "setupClient",
-        "useMultipleMongoses": false
-      }
-    }
-  ],
-  "initialData": [
-    {
-      "collectionName": "backpressure-network-timeout-error",
-      "databaseName": "sdam-tests",
-      "documents": [
-        {
-          "_id": 1
-        },
-        {
-          "_id": 2
-        }
-      ]
-    }
-  ],
-  "tests": [
-    {
-      "description": "apply backpressure on network timeout error during connection establishment",
-      "operations": [
-        {
-          "name": "createEntities",
-          "object": "testRunner",
-          "arguments": {
-            "entities": [
-              {
-                "client": {
-                  "id": "client",
-                  "useMultipleMongoses": false,
-                  "observeEvents": [
-                    "serverDescriptionChangedEvent",
-                    "poolClearedEvent"
-                  ],
-                  "uriOptions": {
-                    "retryWrites": false,
-                    "heartbeatFrequencyMS": 1000000,
-                    "appname": "backpressureNetworkTimeoutErrorTest",
-                    "serverMonitoringMode": "poll",
-                    "connectTimeoutMS": 250,
-                    "socketTimeoutMS": 250
-                  }
-                }
-              },
-              {
-                "database": {
-                  "id": "database",
-                  "client": "client",
-                  "databaseName": "sdam-tests"
-                }
-              },
-              {
-                "collection": {
-                  "id": "collection",
-                  "database": "database",
-                  "collectionName": "backpressure-network-timeout-error"
-                }
-              }
-            ]
-          }
-        },
-        {
-          "name": "waitForEvent",
-          "object": "testRunner",
-          "arguments": {
-            "client": "client",
-            "event": {
-              "serverDescriptionChangedEvent": {}
-            },
-            "count": 1
-          }
-        },
-        {
-          "name": "failPoint",
-          "object": "testRunner",
-          "arguments": {
-            "client": "setupClient",
-            "failPoint": {
-              "configureFailPoint": "failCommand",
-              "mode": "alwaysOn",
-              "data": {
-                "failCommands": [
-                  "isMaster",
-                  "hello"
-                ],
-                "blockConnection": true,
-                "blockTimeMS": 500,
-                "appName": "backpressureNetworkTimeoutErrorTest"
-              }
-            }
-          }
-        },
-        {
-          "name": "insertMany",
-          "object": "collection",
-          "arguments": {
-            "documents": [
-              {
-                "_id": 3
-              },
-              {
-                "_id": 4
-              }
-            ]
-          },
-          "expectError": {
-            "isError": true,
-            "errorLabelsContain": [
-              "SystemOverloadedError",
-              "RetryableError"
-            ]
-          }
-        }
-      ],
-      "expectEvents": [
-        {
-          "client": "client",
-          "eventType": "cmap",
-          "events": []
-        }
-      ]
-    }
-  ]
-}
diff --git a/test/discovery_and_monitoring/unified/backpressure-server-description-unchanged-on-min-pool-size-population-error.json b/test/discovery_and_monitoring/unified/backpressure-server-description-unchanged-on-min-pool-size-population-error.json
deleted file mode 100644
index 35a49c132..000000000
--- a/test/discovery_and_monitoring/unified/backpressure-server-description-unchanged-on-min-pool-size-population-error.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "description": "backpressure-server-description-unchanged-on-min-pool-size-population-error",
-  "schemaVersion": "1.17",
-  "runOnRequirements": [
-    {
-      "minServerVersion": "4.4",
-      "serverless": "forbid",
-      "topologies": [
-        "single"
-      ]
-    }
-  ],
-  "createEntities": [
-    {
-      "client": {
-        "id": "setupClient",
-        "useMultipleMongoses": false
-      }
-    }
-  ],
-  "tests": [
-    {
-      "description": "the server description is not changed on handshake error during minPoolSize population",
-      "operations": [
-        {
-          "name": "createEntities",
-          "object": "testRunner",
-          "arguments": {
-            "entities": [
-              {
-                "client": {
-                  "id": "client",
-                  "observeEvents": [
-                    "serverDescriptionChangedEvent",
-                    "connectionClosedEvent"
-                  ],
-                  "uriOptions": {
-                    "appname": "authErrorTest",
-                    "minPoolSize": 5,
-                    "maxConnecting": 1,
-                    "serverMonitoringMode": "poll",
-                    "heartbeatFrequencyMS": 1000000
-                  }
-                }
-              }
-            ]
-          }
-        },
-        {
-          "name": "failPoint",
-          "object": "testRunner",
-          "arguments": {
-            "client": "setupClient",
-            "failPoint": {
-              "configureFailPoint": "failCommand",
-              "mode": {
-                "skip": 1
-              },
-              "data": {
-                "failCommands": [
-                  "hello",
-                  "isMaster"
-                ],
-                "appName": "authErrorTest",
-                "closeConnection": true
-              }
-            }
-          }
-        },
-        {
-          "name": "waitForEvent",
-          "object": "testRunner",
-          "arguments": {
-            "client": "client",
-            "event": {
-              "serverDescriptionChangedEvent": {}
-            },
-            "count": 1
-          }
-        },
-        {
-          "name": "waitForEvent",
-          "object": "testRunner",
-          "arguments": {
-            "client": "client",
-            "event": {
-              "connectionClosedEvent": {}
-            },
-            "count": 1
-          }
-        }
-      ],
-      "expectEvents": [
-        {
-          "client": "client",
-          "eventType": "sdam",
-          "events": [
-            {
-              "serverDescriptionChangedEvent": {}
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
diff --git a/test/load_balancer/sdam-error-handling.json b/test/load_balancer/sdam-error-handling.json
index 41bc90be7..5892dcacd 100644
--- a/test/load_balancer/sdam-error-handling.json
+++ b/test/load_balancer/sdam-error-handling.json
@@ -282,7 +282,7 @@
                   "isMaster",
                   "hello"
                 ],
-                "errorCode": 11600,
+                "closeConnection": true,
                 "appName": "lbSDAMErrorTestClient"
               }
             }
@@ -297,7 +297,7 @@
             }
           },
           "expectError": {
-            "isError": true
+            "isClientError": true
           }
         }
       ],