From b0675f33396d87ec3da8e5af6015dde3502fe842 Mon Sep 17 00:00:00 2001
From: Kaitlin Mahar <kaitlinmahar@gmail.com>
Date: Fri, 12 Aug 2022 15:21:45 -0400
Subject: [PATCH] sync unified change streams test, remove legacy tests

---
 .../SyncChangeStreamTests.swift               |  301 +--
 .../tests/legacy/change-streams-errors.json   |  153 --
 .../change-streams-resume-allowlist.json      | 1750 ------------
 .../change-streams-resume-errorLabels.json    | 1652 ------------
 .../tests/legacy/change-streams.json          |  795 ------
 .../tests/unified/change-streams-errors.json  |  246 ++
 .../tests/unified/change-streams-errors.yml   |  120 +
 .../change-streams-pre_and_post_images.json   |  827 ++++++
 .../change-streams-pre_and_post_images.yml    |  351 +++
 .../change-streams-resume-allowlist.json      | 2348 +++++++++++++++++
 .../change-streams-resume-allowlist.yml       | 1169 ++++++++
 .../change-streams-resume-errorLabels.json    | 2130 +++++++++++++++
 .../change-streams-resume-errorLabels.yml     | 1069 ++++++++
 .../change-streams-showExpandedEvents.json    |  509 ++++
 .../change-streams-showExpandedEvents.yml     |  297 +++
 15 files changed, 9074 insertions(+), 4643 deletions(-)
 delete mode 100644 Tests/Specs/change-streams/tests/legacy/change-streams-errors.json
 delete mode 100644 Tests/Specs/change-streams/tests/legacy/change-streams-resume-allowlist.json
 delete mode 100644 Tests/Specs/change-streams/tests/legacy/change-streams-resume-errorLabels.json
 delete mode 100644 Tests/Specs/change-streams/tests/legacy/change-streams.json
 create mode 100644 Tests/Specs/change-streams/tests/unified/change-streams-errors.json
 create mode 100644 Tests/Specs/change-streams/tests/unified/change-streams-errors.yml
 create mode 100644 Tests/Specs/change-streams/tests/unified/change-streams-pre_and_post_images.json
 create mode 100644 Tests/Specs/change-streams/tests/unified/change-streams-pre_and_post_images.yml
 create mode 100644 Tests/Specs/change-streams/tests/unified/change-streams-resume-allowlist.json
 create mode 100644 Tests/Specs/change-streams/tests/unified/change-streams-resume-allowlist.yml
 create mode 100644 Tests/Specs/change-streams/tests/unified/change-streams-resume-errorLabels.json
 create mode 100644 Tests/Specs/change-streams/tests/unified/change-streams-resume-errorLabels.yml
 create mode 100644 Tests/Specs/change-streams/tests/unified/change-streams-showExpandedEvents.json
 create mode 100644 Tests/Specs/change-streams/tests/unified/change-streams-showExpandedEvents.yml

diff --git a/Tests/MongoSwiftSyncTests/SyncChangeStreamTests.swift b/Tests/MongoSwiftSyncTests/SyncChangeStreamTests.swift
index c624719aa..8e922799a 100644
--- a/Tests/MongoSwiftSyncTests/SyncChangeStreamTests.swift
+++ b/Tests/MongoSwiftSyncTests/SyncChangeStreamTests.swift
@@ -3,309 +3,24 @@ import Nimble
 import TestsCommon
 import XCTest
 
-/// The entity on which to start a change stream.
-internal enum ChangeStreamTarget: String, Decodable {
-    /// Indicates the change stream will be opened to watch a client.
-    case client
-
-    /// Indicates the change stream will be opened to watch a database.
-    case database
-
-    /// Indicates the change stream will be opened to watch a collection.
-    case collection
-
-    /// Open a change stream against this target. An error will be thrown if the necessary namespace information is not
-    /// provided.
-    internal func watch(
-        _ client: MongoClient,
-        _ database: String?,
-        _ collection: String?,
-        _ pipeline: [BSONDocument],
-        _ options: ChangeStreamOptions
-    ) throws -> ChangeStream<BSONDocument> {
-        switch self {
-        case .client:
-            return try client.watch(pipeline, options: options, withEventType: BSONDocument.self)
-        case .database:
-            guard let database = database else {
-                throw TestError(message: "missing db in watch")
-            }
-            return try client.db(database).watch(pipeline, options: options, withEventType: BSONDocument.self)
-        case .collection:
-            guard let collection = collection, let database = database else {
-                throw TestError(message: "missing db or collection in watch")
-            }
-            return try client.db(database)
-                .collection(collection)
-                .watch(pipeline, options: options, withEventType: BSONDocument.self)
-        }
-    }
-}
-
-/// An operation performed as part of a `ChangeStreamTest` (e.g. a CRUD operation, an drop, etc.)
-/// This struct includes the namespace against which it should be run.
-internal struct ChangeStreamTestOperation: Decodable {
-    /// The operation itself to run.
-    private let operation: AnyTestOperation
-
-    /// The database to run the operation against.
-    private let database: String
-
-    /// The collection to run the operation against.
-    private let collection: String
-
-    private enum CodingKeys: String, CodingKey {
-        case database, collection
-    }
-
-    public init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        self.database = try container.decode(String.self, forKey: .database)
-        self.collection = try container.decode(String.self, forKey: .collection)
-        self.operation = try AnyTestOperation(from: decoder)
-    }
-
-    /// Run the operation against the namespace associated with this operation.
-    internal func execute(using client: MongoClient) throws -> TestOperationResult? {
-        let db = client.db(self.database)
-        let coll = db.collection(self.collection)
-        return try self.operation.op.execute(on: coll, sessions: [:])
-    }
-}
-
-/// The outcome of a given `ChangeStreamTest`.
-internal enum ChangeStreamTestResult: Decodable {
-    /// Describes an error received during the test
-    case error(code: Int, labels: [String]?)
-
-    /// An array of event documents expected to be received from the change stream without error during the test.
-    case success([BSONDocument])
-
-    /// Top-level coding keys. Used for determining whether this result is a success or failure.
-    internal enum CodingKeys: CodingKey {
-        case error, success
-    }
-
-    /// Coding keys used specifically for decoding the `.error` case.
-    internal enum ErrorCodingKeys: CodingKey {
-        case code, errorLabels
-    }
-
-    /// Asserts that the given error matches the one expected by this result.
-    internal func assertMatchesError(error: Error, description: String) {
-        guard case let .error(code, labels) = self else {
-            fail("\(description) failed: got error but result success")
-            return
-        }
-        guard let seenError = error as? MongoError.CommandError else {
-            fail("\(description) failed: didn't get command error")
-            return
-        }
-
-        expect(seenError.code).to(equal(code), description: description)
-        if let labels = labels {
-            expect(seenError.errorLabels).toNot(beNil(), description: description)
-            expect(seenError.errorLabels).to(equal(labels), description: description)
-        }
-    }
-
-    public init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        if container.contains(.success) {
-            self = .success(try container.decode([BSONDocument].self, forKey: .success))
-        } else {
-            let nested = try container.nestedContainer(keyedBy: ErrorCodingKeys.self, forKey: .error)
-            let code = try nested.decode(Int.self, forKey: .code)
-            let labels = try nested.decodeIfPresent([String].self, forKey: .errorLabels)
-            self = .error(code: code, labels: labels)
-        }
-    }
-}
-
-/// Struct representing a single test within a spec test JSON file.
-internal struct ChangeStreamTest: Decodable, FailPointConfigured {
-    /// The title of this test.
-    let description: String
-
-    /// The minimum server version that this test can be run against.
-    let minServerVersion: ServerVersion
-
-    /// The maximum server version that this test can be run against.
-    let maxServerVersion: ServerVersion?
-
-    /// The fail point that should be set prior to running this test.
-    let failPoint: FailPoint?
-
-    /// The entity on which to run the change stream.
-    let target: ChangeStreamTarget
-
-    /// An array of server topologies against which to run the test.
-    let topology: [TestTopologyConfiguration]
-
-    /// An array of additional aggregation pipeline stages to pass to the `watch` used to create the change stream for
-    /// this test.
-    let changeStreamPipeline: [BSONDocument]
-
-    /// Additional options to pass to the `watch` used to create the change stream for this test.
-    let changeStreamOptions: ChangeStreamOptions
-
-    /// An array of documents, each describing an operation that should be run as part of this test.
-    let operations: [ChangeStreamTestOperation]
-
-    /// A list of command-started events that are expected to have been emitted by the client that starts the change
-    /// stream for this test.
-    let expectations: [TestCommandStartedEvent]?
-
-    // The expected result of running this test.
-    let result: ChangeStreamTestResult
-
-    var activeFailPoint: FailPoint?
-    var targetedHost: ServerAddress?
-
-    internal mutating func run(globalClient: MongoClient, database: String, collection: String) throws {
-        let client = try MongoClient.makeTestClient()
-        let monitor = client.addCommandMonitor()
-
-        if let failPoint = self.failPoint {
-            try failPoint.enable(using: globalClient)
-        }
-        defer { self.failPoint?.disable(using: globalClient) }
-
-        monitor.captureEvents {
-            do {
-                let changeStream = try self.target.watch(
-                    client,
-                    database,
-                    collection,
-                    self.changeStreamPipeline,
-                    self.changeStreamOptions
-                )
-                for operation in self.operations {
-                    _ = try operation.execute(using: globalClient)
-                }
-
-                switch self.result {
-                case .error:
-                    _ = try changeStream.nextWithTimeout()
-                    fail("\(self.description) failed: expected error but got none while iterating")
-                case let .success(events):
-                    var seenEvents: [BSONDocument] = []
-                    for _ in 0..<events.count {
-                        guard let event = try changeStream.nextWithTimeout() else {
-                            XCTFail("Unexpectedly got no event from change stream in test: \(self.description)")
-                            return
-                        }
-                        seenEvents.append(event)
-                    }
-                    expect(seenEvents).to(match(events), description: self.description)
-                }
-            } catch {
-                self.result.assertMatchesError(error: error, description: self.description)
-            }
-        }
-
-        if let expectations = self.expectations {
-            let commandEvents = monitor.commandStartedEvents()
-                .filter { ![LEGACY_HELLO, "hello", "killCursors"].contains($0.commandName) }
-                .map { TestCommandStartedEvent(from: $0) }
-            expect(commandEvents).to(match(expectations), description: self.description)
-        }
-    }
-}
-
-/// Struct representing a single change-streams spec test JSON file.
-private struct ChangeStreamTestFile: Decodable {
-    private enum CodingKeys: String, CodingKey {
-        case databaseName = "database_name",
-             collectionName = "collection_name",
-             database2Name = "database2_name",
-             collection2Name = "collection2_name",
-             tests
-    }
-
-    /// The default database.
-    let databaseName: String
-
-    /// The default collection.
-    let collectionName: String
-
-    /// Secondary database.
-    let database2Name: String?
-
-    // Secondary collection.
-    let collection2Name: String?
-
-    /// An array of tests that are to be run independently of each other.
-    let tests: [ChangeStreamTest]
-}
-
-/// Class covering the JSON spec tests associated with change streams.
-final class ChangeStreamSpecTests: MongoSwiftTestCase {
-    func testChangeStreamSpec() throws {
-        let tests = try retrieveSpecTestFiles(
-            specName: "change-streams",
-            subdirectory: "legacy",
-            asType: ChangeStreamTestFile.self
-        )
-
-        let globalClient = try MongoClient.makeTestClient()
-
-        for (testName, testFile) in tests {
-            let db1 = globalClient.db(testFile.databaseName)
-            // only some test files use a second database.
-            let db2: MongoDatabase?
-            if let db2Name = testFile.database2Name {
-                db2 = globalClient.db(db2Name)
-            } else {
-                db2 = nil
-            }
-            defer {
-                try? db1.drop()
-                try? db2?.drop()
-            }
-            print("\n------------\nExecuting tests from file \(testName)...\n")
-            for var test in testFile.tests {
-                let testRequirements = TestRequirement(
-                    minServerVersion: test.minServerVersion,
-                    maxServerVersion: test.maxServerVersion,
-                    acceptableTopologies: test.topology
-                )
-
-                let unmetRequirement = try globalClient.getUnmetRequirement(testRequirements)
-                guard unmetRequirement == nil else {
-                    printSkipMessage(testName: test.description, unmetRequirement: unmetRequirement!)
-                    continue
-                }
-
-                print("Executing test: \(test.description)")
-
-                try db1.drop()
-                try db2?.drop()
-                _ = try db1.createCollection(testFile.collectionName)
-                _ = try db2?.createCollection(testFile.collection2Name ?? "foo")
-
-                try test.run(
-                    globalClient: globalClient,
-                    database: testFile.databaseName,
-                    collection: testFile.collectionName
-                )
-            }
-        }
-    }
-
+final class SyncChangeStreamTests: MongoSwiftTestCase {
+    let excludeFiles = [
+        // TODO: SWIFT-1458 Unskip.
+        "change-streams-showExpandedEvents.json",
+        // TODO: SWIFT-1472 Unskip.
+        "change-streams-pre_and_post_images.json"
+    ]
     func testChangeStreamSpecUnified() throws {
         let tests = try retrieveSpecTestFiles(
             specName: "change-streams",
             subdirectory: "unified",
+            excludeFiles: excludeFiles,
             asType: UnifiedTestFile.self
         ).map { $0.1 }
         let testRunner = try UnifiedTestRunner()
         try testRunner.runFiles(tests)
     }
-}
 
-/// Class for spec prose tests and other integration tests associated with change streams.
-final class SyncChangeStreamTests: MongoSwiftTestCase {
     /// How long in total a change stream should poll for an event or error before returning.
     /// Used as a default value for `ChangeStream.nextWithTimeout`
     public static let TIMEOUT: TimeInterval = 15
diff --git a/Tests/Specs/change-streams/tests/legacy/change-streams-errors.json b/Tests/Specs/change-streams/tests/legacy/change-streams-errors.json
deleted file mode 100644
index 7b3fa8068..000000000
--- a/Tests/Specs/change-streams/tests/legacy/change-streams-errors.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
-  "collection_name": "test",
-  "database_name": "change-stream-tests",
-  "collection2_name": "test2",
-  "database2_name": "change-stream-tests-2",
-  "tests": [
-    {
-      "description": "The watch helper must not throw a custom exception when executed against a single server topology, but instead depend on a server error",
-      "minServerVersion": "3.6.0",
-      "target": "collection",
-      "topology": [
-        "single"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [],
-      "expectations": null,
-      "result": {
-        "error": {
-          "code": 40573
-        }
-      }
-    },
-    {
-      "description": "Change Stream should error when an invalid aggregation stage is passed in",
-      "minServerVersion": "3.6.0",
-      "target": "collection",
-      "topology": [
-        "replicaset"
-      ],
-      "changeStreamPipeline": [
-        {
-          "$unsupported": "foo"
-        }
-      ],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "z": 3
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                },
-                {
-                  "$unsupported": "foo"
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "error": {
-          "code": 40324
-        }
-      }
-    },
-    {
-      "description": "Change Stream should error when _id is projected out",
-      "minServerVersion": "4.1.11",
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded",
-        "load-balanced"
-      ],
-      "changeStreamPipeline": [
-        {
-          "$project": {
-            "_id": 0
-          }
-        }
-      ],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "z": 3
-            }
-          }
-        }
-      ],
-      "result": {
-        "error": {
-          "code": 280
-        }
-      }
-    },
-    {
-      "description": "change stream errors on ElectionInProgress",
-      "minServerVersion": "4.2",
-      "failPoint": {
-        "configureFailPoint": "failCommand",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "failCommands": [
-            "getMore"
-          ],
-          "errorCode": 216,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded",
-        "load-balanced"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "z": 3
-            }
-          }
-        }
-      ],
-      "result": {
-        "error": {
-          "code": 216
-        }
-      }
-    }
-  ]
-}
diff --git a/Tests/Specs/change-streams/tests/legacy/change-streams-resume-allowlist.json b/Tests/Specs/change-streams/tests/legacy/change-streams-resume-allowlist.json
deleted file mode 100644
index baffc8fba..000000000
--- a/Tests/Specs/change-streams/tests/legacy/change-streams-resume-allowlist.json
+++ /dev/null
@@ -1,1750 +0,0 @@
-{
-  "collection_name": "test",
-  "database_name": "change-stream-tests",
-  "tests": [
-    {
-      "description": "change stream resumes after a network error",
-      "minServerVersion": "4.2",
-      "failPoint": {
-        "configureFailPoint": "failCommand",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "failCommands": [
-            "getMore"
-          ],
-          "closeConnection": true
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded",
-        "load-balanced"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after HostUnreachable",
-      "minServerVersion": "4.2",
-      "maxServerVersion": "4.2.99",
-      "failPoint": {
-        "configureFailPoint": "failCommand",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "failCommands": [
-            "getMore"
-          ],
-          "errorCode": 6,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after HostNotFound",
-      "minServerVersion": "4.2",
-      "maxServerVersion": "4.2.99",
-      "failPoint": {
-        "configureFailPoint": "failCommand",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "failCommands": [
-            "getMore"
-          ],
-          "errorCode": 7,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after NetworkTimeout",
-      "minServerVersion": "4.2",
-      "maxServerVersion": "4.2.99",
-      "failPoint": {
-        "configureFailPoint": "failCommand",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "failCommands": [
-            "getMore"
-          ],
-          "errorCode": 89,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after ShutdownInProgress",
-      "minServerVersion": "4.2",
-      "maxServerVersion": "4.2.99",
-      "failPoint": {
-        "configureFailPoint": "failCommand",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "failCommands": [
-            "getMore"
-          ],
-          "errorCode": 91,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after PrimarySteppedDown",
-      "minServerVersion": "4.2",
-      "maxServerVersion": "4.2.99",
-      "failPoint": {
-        "configureFailPoint": "failCommand",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "failCommands": [
-            "getMore"
-          ],
-          "errorCode": 189,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after ExceededTimeLimit",
-      "minServerVersion": "4.2",
-      "maxServerVersion": "4.2.99",
-      "failPoint": {
-        "configureFailPoint": "failCommand",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "failCommands": [
-            "getMore"
-          ],
-          "errorCode": 262,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after SocketException",
-      "minServerVersion": "4.2",
-      "maxServerVersion": "4.2.99",
-      "failPoint": {
-        "configureFailPoint": "failCommand",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "failCommands": [
-            "getMore"
-          ],
-          "errorCode": 9001,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after NotWritablePrimary",
-      "minServerVersion": "4.2",
-      "maxServerVersion": "4.2.99",
-      "failPoint": {
-        "configureFailPoint": "failCommand",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "failCommands": [
-            "getMore"
-          ],
-          "errorCode": 10107,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after InterruptedAtShutdown",
-      "minServerVersion": "4.2",
-      "maxServerVersion": "4.2.99",
-      "failPoint": {
-        "configureFailPoint": "failCommand",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "failCommands": [
-            "getMore"
-          ],
-          "errorCode": 11600,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after InterruptedDueToReplStateChange",
-      "minServerVersion": "4.2",
-      "maxServerVersion": "4.2.99",
-      "failPoint": {
-        "configureFailPoint": "failCommand",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "failCommands": [
-            "getMore"
-          ],
-          "errorCode": 11602,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after NotPrimaryNoSecondaryOk",
-      "minServerVersion": "4.2",
-      "maxServerVersion": "4.2.99",
-      "failPoint": {
-        "configureFailPoint": "failCommand",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "failCommands": [
-            "getMore"
-          ],
-          "errorCode": 13435,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after NotPrimaryOrSecondary",
-      "minServerVersion": "4.2",
-      "maxServerVersion": "4.2.99",
-      "failPoint": {
-        "configureFailPoint": "failCommand",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "failCommands": [
-            "getMore"
-          ],
-          "errorCode": 13436,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after StaleShardVersion",
-      "minServerVersion": "4.2",
-      "maxServerVersion": "4.2.99",
-      "failPoint": {
-        "configureFailPoint": "failCommand",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "failCommands": [
-            "getMore"
-          ],
-          "errorCode": 63,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after StaleEpoch",
-      "minServerVersion": "4.2",
-      "maxServerVersion": "4.2.99",
-      "failPoint": {
-        "configureFailPoint": "failCommand",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "failCommands": [
-            "getMore"
-          ],
-          "errorCode": 150,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after RetryChangeStream",
-      "minServerVersion": "4.2",
-      "maxServerVersion": "4.2.99",
-      "failPoint": {
-        "configureFailPoint": "failCommand",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "failCommands": [
-            "getMore"
-          ],
-          "errorCode": 234,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after FailedToSatisfyReadPreference",
-      "minServerVersion": "4.2",
-      "maxServerVersion": "4.2.99",
-      "failPoint": {
-        "configureFailPoint": "failCommand",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "failCommands": [
-            "getMore"
-          ],
-          "errorCode": 133,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after CursorNotFound",
-      "minServerVersion": "4.2",
-      "failPoint": {
-        "configureFailPoint": "failCommand",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "failCommands": [
-            "getMore"
-          ],
-          "errorCode": 43,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    }
-  ]
-}
diff --git a/Tests/Specs/change-streams/tests/legacy/change-streams-resume-errorLabels.json b/Tests/Specs/change-streams/tests/legacy/change-streams-resume-errorLabels.json
deleted file mode 100644
index 2bac61d3b..000000000
--- a/Tests/Specs/change-streams/tests/legacy/change-streams-resume-errorLabels.json
+++ /dev/null
@@ -1,1652 +0,0 @@
-{
-  "collection_name": "test",
-  "database_name": "change-stream-tests",
-  "tests": [
-    {
-      "description": "change stream resumes after HostUnreachable",
-      "minServerVersion": "4.3.1",
-      "failPoint": {
-        "configureFailPoint": "failGetMoreAfterCursorCheckout",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "errorCode": 6,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded",
-        "load-balanced"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after HostNotFound",
-      "minServerVersion": "4.3.1",
-      "failPoint": {
-        "configureFailPoint": "failGetMoreAfterCursorCheckout",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "errorCode": 7,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded",
-        "load-balanced"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after NetworkTimeout",
-      "minServerVersion": "4.3.1",
-      "failPoint": {
-        "configureFailPoint": "failGetMoreAfterCursorCheckout",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "errorCode": 89,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded",
-        "load-balanced"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after ShutdownInProgress",
-      "minServerVersion": "4.3.1",
-      "failPoint": {
-        "configureFailPoint": "failGetMoreAfterCursorCheckout",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "errorCode": 91,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded",
-        "load-balanced"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after PrimarySteppedDown",
-      "minServerVersion": "4.3.1",
-      "failPoint": {
-        "configureFailPoint": "failGetMoreAfterCursorCheckout",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "errorCode": 189,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded",
-        "load-balanced"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after ExceededTimeLimit",
-      "minServerVersion": "4.3.1",
-      "failPoint": {
-        "configureFailPoint": "failGetMoreAfterCursorCheckout",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "errorCode": 262,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded",
-        "load-balanced"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after SocketException",
-      "minServerVersion": "4.3.1",
-      "failPoint": {
-        "configureFailPoint": "failGetMoreAfterCursorCheckout",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "errorCode": 9001,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded",
-        "load-balanced"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after NotWritablePrimary",
-      "minServerVersion": "4.3.1",
-      "failPoint": {
-        "configureFailPoint": "failGetMoreAfterCursorCheckout",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "errorCode": 10107,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded",
-        "load-balanced"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after InterruptedAtShutdown",
-      "minServerVersion": "4.3.1",
-      "failPoint": {
-        "configureFailPoint": "failGetMoreAfterCursorCheckout",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "errorCode": 11600,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded",
-        "load-balanced"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after InterruptedDueToReplStateChange",
-      "minServerVersion": "4.3.1",
-      "failPoint": {
-        "configureFailPoint": "failGetMoreAfterCursorCheckout",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "errorCode": 11602,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded",
-        "load-balanced"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after NotPrimaryNoSecondaryOk",
-      "minServerVersion": "4.3.1",
-      "failPoint": {
-        "configureFailPoint": "failGetMoreAfterCursorCheckout",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "errorCode": 13435,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded",
-        "load-balanced"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after NotPrimaryOrSecondary",
-      "minServerVersion": "4.3.1",
-      "failPoint": {
-        "configureFailPoint": "failGetMoreAfterCursorCheckout",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "errorCode": 13436,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded",
-        "load-balanced"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after StaleShardVersion",
-      "minServerVersion": "4.3.1",
-      "failPoint": {
-        "configureFailPoint": "failGetMoreAfterCursorCheckout",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "errorCode": 63,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded",
-        "load-balanced"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after StaleEpoch",
-      "minServerVersion": "4.3.1",
-      "failPoint": {
-        "configureFailPoint": "failGetMoreAfterCursorCheckout",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "errorCode": 150,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded",
-        "load-balanced"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after RetryChangeStream",
-      "minServerVersion": "4.3.1",
-      "failPoint": {
-        "configureFailPoint": "failGetMoreAfterCursorCheckout",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "errorCode": 234,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded",
-        "load-balanced"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes after FailedToSatisfyReadPreference",
-      "minServerVersion": "4.3.1",
-      "failPoint": {
-        "configureFailPoint": "failGetMoreAfterCursorCheckout",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "errorCode": 133,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded",
-        "load-balanced"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream resumes if error contains ResumableChangeStreamError",
-      "minServerVersion": "4.3.1",
-      "failPoint": {
-        "configureFailPoint": "failCommand",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "failCommands": [
-            "getMore"
-          ],
-          "errorCode": 50,
-          "closeConnection": false,
-          "errorLabels": [
-            "ResumableChangeStreamError"
-          ]
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded",
-        "load-balanced"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "getMore": 42,
-              "collection": "test"
-            },
-            "command_name": "getMore",
-            "database_name": "change-stream-tests"
-          }
-        },
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "change stream does not resume if error does not contain ResumableChangeStreamError",
-      "minServerVersion": "4.3.1",
-      "failPoint": {
-        "configureFailPoint": "failCommand",
-        "mode": {
-          "times": 1
-        },
-        "data": {
-          "failCommands": [
-            "getMore"
-          ],
-          "errorCode": 6,
-          "closeConnection": false
-        }
-      },
-      "target": "collection",
-      "topology": [
-        "replicaset",
-        "sharded",
-        "load-balanced"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "result": {
-        "error": {
-          "code": 6
-        }
-      }
-    }
-  ]
-}
diff --git a/Tests/Specs/change-streams/tests/legacy/change-streams.json b/Tests/Specs/change-streams/tests/legacy/change-streams.json
deleted file mode 100644
index 54b76af0a..000000000
--- a/Tests/Specs/change-streams/tests/legacy/change-streams.json
+++ /dev/null
@@ -1,795 +0,0 @@
-{
-  "collection_name": "test",
-  "database_name": "change-stream-tests",
-  "collection2_name": "test2",
-  "database2_name": "change-stream-tests-2",
-  "tests": [
-    {
-      "description": "$changeStream must be the first stage in a change stream pipeline sent to the server",
-      "minServerVersion": "3.6.0",
-      "target": "collection",
-      "topology": [
-        "replicaset"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "The server returns change stream responses in the specified server response format",
-      "minServerVersion": "3.6.0",
-      "target": "collection",
-      "topology": [
-        "replicaset"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        }
-      ],
-      "expectations": null,
-      "result": {
-        "success": [
-          {
-            "_id": "42",
-            "documentKey": "42",
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "Executing a watch helper on a Collection results in notifications for changes to the specified collection",
-      "minServerVersion": "3.6.0",
-      "target": "collection",
-      "topology": [
-        "replicaset"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test2",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        },
-        {
-          "database": "change-stream-tests-2",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "y": 2
-            }
-          }
-        },
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "z": 3
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "z": {
-                "$numberInt": "3"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "Change Stream should allow valid aggregate pipeline stages",
-      "minServerVersion": "3.6.0",
-      "target": "collection",
-      "topology": [
-        "replicaset"
-      ],
-      "changeStreamPipeline": [
-        {
-          "$match": {
-            "fullDocument.z": 3
-          }
-        }
-      ],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "y": 2
-            }
-          }
-        },
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "z": 3
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                },
-                {
-                  "$match": {
-                    "fullDocument.z": {
-                      "$numberInt": "3"
-                    }
-                  }
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "z": {
-                "$numberInt": "3"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "Executing a watch helper on a Database results in notifications for changes to all collections in the specified database.",
-      "minServerVersion": "3.8.0",
-      "target": "database",
-      "topology": [
-        "replicaset"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test2",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        },
-        {
-          "database": "change-stream-tests-2",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "y": 2
-            }
-          }
-        },
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "z": 3
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": {
-                "$numberInt": "1"
-              },
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test2"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          },
-          {
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "z": {
-                "$numberInt": "3"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "Executing a watch helper on a MongoClient results in notifications for changes to all collections in all databases in the cluster.",
-      "minServerVersion": "3.8.0",
-      "target": "client",
-      "topology": [
-        "replicaset"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test2",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        },
-        {
-          "database": "change-stream-tests-2",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "y": 2
-            }
-          }
-        },
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "z": 3
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": {
-                "$numberInt": "1"
-              },
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {
-                    "allChangesForCluster": true
-                  }
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "admin"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test2"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          },
-          {
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests-2",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "y": {
-                "$numberInt": "2"
-              }
-            }
-          },
-          {
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "z": {
-                "$numberInt": "3"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "Test insert, update, replace, and delete event types",
-      "minServerVersion": "3.6.0",
-      "target": "collection",
-      "topology": [
-        "replicaset"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        },
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "updateOne",
-          "arguments": {
-            "filter": {
-              "x": 1
-            },
-            "update": {
-              "$set": {
-                "x": 2
-              }
-            }
-          }
-        },
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "replaceOne",
-          "arguments": {
-            "filter": {
-              "x": 2
-            },
-            "replacement": {
-              "x": 3
-            }
-          }
-        },
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "deleteOne",
-          "arguments": {
-            "filter": {
-              "x": 3
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          },
-          {
-            "operationType": "update",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "updateDescription": {
-              "updatedFields": {
-                "x": {
-                  "$numberInt": "2"
-                }
-              }
-            }
-          },
-          {
-            "operationType": "replace",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "3"
-              }
-            }
-          },
-          {
-            "operationType": "delete",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "description": "Test rename and invalidate event types",
-      "minServerVersion": "4.0.1",
-      "target": "collection",
-      "topology": [
-        "replicaset"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "rename",
-          "arguments": {
-            "to": "test2"
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "operationType": "rename",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "to": {
-              "db": "change-stream-tests",
-              "coll": "test2"
-            }
-          },
-          {
-            "operationType": "invalidate"
-          }
-        ]
-      }
-    },
-    {
-      "description": "Test drop and invalidate event types",
-      "minServerVersion": "4.0.1",
-      "target": "collection",
-      "topology": [
-        "replicaset"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {},
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "drop"
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {},
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "operationType": "drop",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            }
-          },
-          {
-            "operationType": "invalidate"
-          }
-        ]
-      }
-    },
-    {
-      "description": "Test consecutive resume",
-      "minServerVersion": "4.1.7",
-      "target": "collection",
-      "topology": [
-        "replicaset"
-      ],
-      "changeStreamPipeline": [],
-      "changeStreamOptions": {
-        "batchSize": 1
-      },
-      "failPoint": {
-        "configureFailPoint": "failCommand",
-        "mode": {
-          "times": 2
-        },
-        "data": {
-          "failCommands": [
-            "getMore"
-          ],
-          "closeConnection": true
-        }
-      },
-      "operations": [
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 1
-            }
-          }
-        },
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 2
-            }
-          }
-        },
-        {
-          "database": "change-stream-tests",
-          "collection": "test",
-          "name": "insertOne",
-          "arguments": {
-            "document": {
-              "x": 3
-            }
-          }
-        }
-      ],
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "aggregate": "test",
-              "cursor": {
-                "batchSize": 1
-              },
-              "pipeline": [
-                {
-                  "$changeStream": {}
-                }
-              ]
-            },
-            "command_name": "aggregate",
-            "database_name": "change-stream-tests"
-          }
-        }
-      ],
-      "result": {
-        "success": [
-          {
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "1"
-              }
-            }
-          },
-          {
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "2"
-              }
-            }
-          },
-          {
-            "operationType": "insert",
-            "ns": {
-              "db": "change-stream-tests",
-              "coll": "test"
-            },
-            "fullDocument": {
-              "x": {
-                "$numberInt": "3"
-              }
-            }
-          }
-        ]
-      }
-    }
-  ]
-}
diff --git a/Tests/Specs/change-streams/tests/unified/change-streams-errors.json b/Tests/Specs/change-streams/tests/unified/change-streams-errors.json
new file mode 100644
index 000000000..04fe8f04f
--- /dev/null
+++ b/Tests/Specs/change-streams/tests/unified/change-streams-errors.json
@@ -0,0 +1,246 @@
+{
+  "description": "change-streams-errors",
+  "schemaVersion": "1.7",
+  "runOnRequirements": [
+    {
+      "serverless": "forbid"
+    }
+  ],
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0",
+        "observeEvents": [
+          "commandStartedEvent"
+        ],
+        "ignoreCommandMonitoringEvents": [
+          "killCursors"
+        ],
+        "useMultipleMongoses": false
+      }
+    },
+    {
+      "client": {
+        "id": "globalClient",
+        "useMultipleMongoses": false
+      }
+    },
+    {
+      "database": {
+        "id": "database0",
+        "client": "client0",
+        "databaseName": "database0"
+      }
+    },
+    {
+      "collection": {
+        "id": "collection0",
+        "database": "database0",
+        "collectionName": "collection0"
+      }
+    },
+    {
+      "database": {
+        "id": "globalDatabase0",
+        "client": "globalClient",
+        "databaseName": "database0"
+      }
+    },
+    {
+      "collection": {
+        "id": "globalCollection0",
+        "database": "globalDatabase0",
+        "collectionName": "collection0"
+      }
+    }
+  ],
+  "initialData": [
+    {
+      "collectionName": "collection0",
+      "databaseName": "database0",
+      "documents": []
+    }
+  ],
+  "tests": [
+    {
+      "description": "The watch helper must not throw a custom exception when executed against a single server topology, but instead depend on a server error",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "3.6.0",
+          "topologies": [
+            "single"
+          ]
+        }
+      ],
+      "operations": [
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "expectError": {
+            "errorCode": 40573
+          }
+        }
+      ]
+    },
+    {
+      "description": "Change Stream should error when an invalid aggregation stage is passed in",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "3.6.0",
+          "topologies": [
+            "replicaset"
+          ]
+        }
+      ],
+      "operations": [
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": [
+              {
+                "$unsupported": "foo"
+              }
+            ]
+          },
+          "expectError": {
+            "errorCode": 40324
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    },
+                    {
+                      "$unsupported": "foo"
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "Change Stream should error when _id is projected out",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "4.1.11",
+          "topologies": [
+            "replicaset",
+            "sharded-replicaset",
+            "load-balanced"
+          ]
+        }
+      ],
+      "operations": [
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": [
+              {
+                "$project": {
+                  "_id": 0
+                }
+              }
+            ]
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "z": 3
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectError": {
+            "errorCode": 280
+          }
+        }
+      ]
+    },
+    {
+      "description": "change stream errors on ElectionInProgress",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "4.2",
+          "topologies": [
+            "replicaset",
+            "sharded-replicaset",
+            "load-balanced"
+          ]
+        }
+      ],
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "getMore"
+                ],
+                "errorCode": 216,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "z": 3
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectError": {
+            "errorCode": 216
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/Tests/Specs/change-streams/tests/unified/change-streams-errors.yml b/Tests/Specs/change-streams/tests/unified/change-streams-errors.yml
new file mode 100644
index 000000000..47ad1d07a
--- /dev/null
+++ b/Tests/Specs/change-streams/tests/unified/change-streams-errors.yml
@@ -0,0 +1,120 @@
+description: "change-streams-errors"
+
+schemaVersion: "1.7"
+
+runOnRequirements:
+  - serverless: forbid
+
+createEntities:
+  - client:
+      id: &client0 client0
+      observeEvents: [ commandStartedEvent ]
+      ignoreCommandMonitoringEvents: [ killCursors ]
+      useMultipleMongoses: false
+  - client:
+      id: &globalClient globalClient
+      useMultipleMongoses: false
+  - database:
+      id: &database0 database0
+      client: *client0
+      databaseName: *database0
+  - collection:
+      id: &collection0 collection0
+      database: *database0
+      collectionName: *collection0
+  - database:
+      id: &globalDatabase0 globalDatabase0
+      client: *globalClient
+      databaseName: *database0
+  - collection:
+      id: &globalCollection0 globalCollection0
+      database: *globalDatabase0
+      collectionName: *collection0
+
+initialData:
+  - collectionName: *collection0
+    databaseName: *database0
+    documents: []
+
+tests:
+  - description: "The watch helper must not throw a custom exception when executed against a single server topology, but instead depend on a server error"
+    runOnRequirements:
+      - minServerVersion: "3.6.0"
+        topologies: [ single ]
+    operations:
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        expectError: { errorCode: 40573 }
+
+  - description: Change Stream should error when an invalid aggregation stage is passed in
+    runOnRequirements:
+      - minServerVersion: "3.6.0"
+        topologies: [ replicaset ]
+    operations:
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline: [ { $unsupported: foo } ]
+        expectError: { errorCode: 40324 }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream: {}
+                  - $unsupported: foo
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: Change Stream should error when _id is projected out
+    runOnRequirements:
+      - minServerVersion: "4.1.11"
+        topologies: [ replicaset, sharded-replicaset, load-balanced ]
+    operations:
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline:
+            - $project: { _id: 0 }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { z: 3 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectError: { errorCode: 280 }
+
+  - description: change stream errors on ElectionInProgress
+    runOnRequirements:
+      - minServerVersion: "4.2"
+        topologies: [ replicaset, sharded-replicaset, load-balanced ]
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ getMore ]
+              errorCode: 216
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline: []
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { z: 3 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectError: { errorCode: 216 }
diff --git a/Tests/Specs/change-streams/tests/unified/change-streams-pre_and_post_images.json b/Tests/Specs/change-streams/tests/unified/change-streams-pre_and_post_images.json
new file mode 100644
index 000000000..8beefb2bc
--- /dev/null
+++ b/Tests/Specs/change-streams/tests/unified/change-streams-pre_and_post_images.json
@@ -0,0 +1,827 @@
+{
+  "description": "change-streams-pre_and_post_images",
+  "schemaVersion": "1.4",
+  "runOnRequirements": [
+    {
+      "minServerVersion": "6.0.0",
+      "topologies": [
+        "replicaset",
+        "sharded-replicaset",
+        "load-balanced"
+      ],
+      "serverless": "forbid"
+    }
+  ],
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0",
+        "observeEvents": [
+          "commandStartedEvent"
+        ],
+        "ignoreCommandMonitoringEvents": [
+          "collMod",
+          "insert",
+          "update",
+          "getMore",
+          "killCursors"
+        ]
+      }
+    },
+    {
+      "database": {
+        "id": "database0",
+        "client": "client0",
+        "databaseName": "change-stream-tests"
+      }
+    },
+    {
+      "collection": {
+        "id": "collection0",
+        "database": "database0",
+        "collectionName": "test"
+      }
+    }
+  ],
+  "initialData": [
+    {
+      "collectionName": "test",
+      "databaseName": "change-stream-tests",
+      "documents": [
+        {
+          "_id": 1
+        }
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "fullDocument:whenAvailable with changeStreamPreAndPostImages enabled",
+      "operations": [
+        {
+          "name": "runCommand",
+          "object": "database0",
+          "arguments": {
+            "commandName": "collMod",
+            "command": {
+              "collMod": "test",
+              "changeStreamPreAndPostImages": {
+                "enabled": true
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": [],
+            "fullDocument": "whenAvailable"
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "updateOne",
+          "object": "collection0",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            },
+            "update": {
+              "$set": {
+                "x": 1
+              }
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "operationType": "update",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            },
+            "updateDescription": {
+              "$$type": "object"
+            },
+            "fullDocument": {
+              "_id": 1,
+              "x": 1
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "test",
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "fullDocument": "whenAvailable"
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "fullDocument:whenAvailable with changeStreamPreAndPostImages disabled",
+      "operations": [
+        {
+          "name": "runCommand",
+          "object": "database0",
+          "arguments": {
+            "commandName": "collMod",
+            "command": {
+              "collMod": "test",
+              "changeStreamPreAndPostImages": {
+                "enabled": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": [],
+            "fullDocument": "whenAvailable"
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "updateOne",
+          "object": "collection0",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            },
+            "update": {
+              "$set": {
+                "x": 1
+              }
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "operationType": "update",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            },
+            "updateDescription": {
+              "$$type": "object"
+            },
+            "fullDocument": null
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "test",
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "fullDocument": "whenAvailable"
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "fullDocument:required with changeStreamPreAndPostImages enabled",
+      "operations": [
+        {
+          "name": "runCommand",
+          "object": "database0",
+          "arguments": {
+            "commandName": "collMod",
+            "command": {
+              "collMod": "test",
+              "changeStreamPreAndPostImages": {
+                "enabled": true
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": [],
+            "fullDocument": "required"
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "updateOne",
+          "object": "collection0",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            },
+            "update": {
+              "$set": {
+                "x": 1
+              }
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "operationType": "update",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            },
+            "updateDescription": {
+              "$$type": "object"
+            },
+            "fullDocument": {
+              "_id": 1,
+              "x": 1
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "test",
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "fullDocument": "required"
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "fullDocument:required with changeStreamPreAndPostImages disabled",
+      "operations": [
+        {
+          "name": "runCommand",
+          "object": "database0",
+          "arguments": {
+            "commandName": "collMod",
+            "command": {
+              "collMod": "test",
+              "changeStreamPreAndPostImages": {
+                "enabled": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": [],
+            "fullDocument": "required"
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "updateOne",
+          "object": "collection0",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            },
+            "update": {
+              "$set": {
+                "x": 1
+              }
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectError": {
+            "isClientError": false
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "test",
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "fullDocument": "required"
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "fullDocumentBeforeChange:whenAvailable with changeStreamPreAndPostImages enabled",
+      "operations": [
+        {
+          "name": "runCommand",
+          "object": "database0",
+          "arguments": {
+            "commandName": "collMod",
+            "command": {
+              "collMod": "test",
+              "changeStreamPreAndPostImages": {
+                "enabled": true
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": [],
+            "fullDocumentBeforeChange": "whenAvailable"
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "updateOne",
+          "object": "collection0",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            },
+            "update": {
+              "$set": {
+                "x": 1
+              }
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "operationType": "update",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            },
+            "updateDescription": {
+              "$$type": "object"
+            },
+            "fullDocumentBeforeChange": {
+              "_id": 1
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "test",
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "fullDocumentBeforeChange": "whenAvailable"
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "fullDocumentBeforeChange:whenAvailable with changeStreamPreAndPostImages disabled",
+      "operations": [
+        {
+          "name": "runCommand",
+          "object": "database0",
+          "arguments": {
+            "commandName": "collMod",
+            "command": {
+              "collMod": "test",
+              "changeStreamPreAndPostImages": {
+                "enabled": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": [],
+            "fullDocumentBeforeChange": "whenAvailable"
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "updateOne",
+          "object": "collection0",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            },
+            "update": {
+              "$set": {
+                "x": 1
+              }
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "operationType": "update",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            },
+            "updateDescription": {
+              "$$type": "object"
+            },
+            "fullDocumentBeforeChange": null
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "test",
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "fullDocumentBeforeChange": "whenAvailable"
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "fullDocumentBeforeChange:required with changeStreamPreAndPostImages enabled",
+      "operations": [
+        {
+          "name": "runCommand",
+          "object": "database0",
+          "arguments": {
+            "commandName": "collMod",
+            "command": {
+              "collMod": "test",
+              "changeStreamPreAndPostImages": {
+                "enabled": true
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": [],
+            "fullDocumentBeforeChange": "required"
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "updateOne",
+          "object": "collection0",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            },
+            "update": {
+              "$set": {
+                "x": 1
+              }
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "operationType": "update",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            },
+            "updateDescription": {
+              "$$type": "object"
+            },
+            "fullDocumentBeforeChange": {
+              "_id": 1
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "test",
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "fullDocumentBeforeChange": "required"
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "fullDocumentBeforeChange:required with changeStreamPreAndPostImages disabled",
+      "operations": [
+        {
+          "name": "runCommand",
+          "object": "database0",
+          "arguments": {
+            "commandName": "collMod",
+            "command": {
+              "collMod": "test",
+              "changeStreamPreAndPostImages": {
+                "enabled": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": [],
+            "fullDocumentBeforeChange": "required"
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "updateOne",
+          "object": "collection0",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            },
+            "update": {
+              "$set": {
+                "x": 1
+              }
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectError": {
+            "isClientError": false
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "test",
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "fullDocumentBeforeChange": "required"
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "fullDocumentBeforeChange:off with changeStreamPreAndPostImages enabled",
+      "operations": [
+        {
+          "name": "runCommand",
+          "object": "database0",
+          "arguments": {
+            "commandName": "collMod",
+            "command": {
+              "collMod": "test",
+              "changeStreamPreAndPostImages": {
+                "enabled": true
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": [],
+            "fullDocumentBeforeChange": "off"
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "updateOne",
+          "object": "collection0",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            },
+            "update": {
+              "$set": {
+                "x": 1
+              }
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "operationType": "update",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            },
+            "updateDescription": {
+              "$$type": "object"
+            },
+            "fullDocumentBeforeChange": {
+              "$$exists": false
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "test",
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "fullDocumentBeforeChange": "off"
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "fullDocumentBeforeChange:off with changeStreamPreAndPostImages disabled",
+      "operations": [
+        {
+          "name": "runCommand",
+          "object": "database0",
+          "arguments": {
+            "commandName": "collMod",
+            "command": {
+              "collMod": "test",
+              "changeStreamPreAndPostImages": {
+                "enabled": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": [],
+            "fullDocumentBeforeChange": "off"
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "updateOne",
+          "object": "collection0",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            },
+            "update": {
+              "$set": {
+                "x": 1
+              }
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "operationType": "update",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            },
+            "updateDescription": {
+              "$$type": "object"
+            },
+            "fullDocumentBeforeChange": {
+              "$$exists": false
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "test",
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "fullDocumentBeforeChange": "off"
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/Tests/Specs/change-streams/tests/unified/change-streams-pre_and_post_images.yml b/Tests/Specs/change-streams/tests/unified/change-streams-pre_and_post_images.yml
new file mode 100644
index 000000000..2f6edd982
--- /dev/null
+++ b/Tests/Specs/change-streams/tests/unified/change-streams-pre_and_post_images.yml
@@ -0,0 +1,351 @@
+description: "change-streams-pre_and_post_images"
+
+schemaVersion: "1.4"
+
+runOnRequirements:
+  - minServerVersion: "6.0.0"
+    topologies: [ replicaset, sharded-replicaset, load-balanced ]
+    serverless: forbid
+
+createEntities:
+  - client:
+      id: &client0 client0
+      observeEvents: [ commandStartedEvent ]
+      ignoreCommandMonitoringEvents: [ collMod, insert, update, getMore, killCursors ]
+  - database:
+      id: &database0 database0
+      client: *client0
+      databaseName: &database0Name change-stream-tests
+  - collection:
+      id: &collection0 collection0
+      database: *database0
+      collectionName: &collection0Name test
+
+initialData:
+  - collectionName: *collection0Name
+    databaseName: *database0Name
+    documents:
+      - { _id: 1 }
+
+tests:
+  - description: "fullDocument:whenAvailable with changeStreamPreAndPostImages enabled"
+    operations:
+      - name: runCommand
+        object: *database0
+        arguments: &enablePreAndPostImages
+          commandName: collMod
+          command:
+            collMod: *collection0Name
+            changeStreamPreAndPostImages: { enabled: true }
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline: []
+          fullDocument: "whenAvailable"
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: updateOne
+        object: *collection0
+        arguments:
+          filter: { _id: 1 }
+          update: { $set: { x: 1 }}
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          operationType: "update"
+          ns: { db: *database0Name, coll: *collection0Name }
+          updateDescription: { $$type: "object" }
+          fullDocument: { _id: 1, x: 1 }
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0Name
+                pipeline:
+                  - $changeStream: { fullDocument: "whenAvailable" }
+
+  - description: "fullDocument:whenAvailable with changeStreamPreAndPostImages disabled"
+    operations:
+      - name: runCommand
+        object: *database0
+        arguments: &disablePreAndPostImages
+          commandName: collMod
+          command:
+            collMod: *collection0Name
+            changeStreamPreAndPostImages: { enabled: false }
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline: []
+          fullDocument: "whenAvailable"
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: updateOne
+        object: *collection0
+        arguments:
+          filter: { _id: 1 }
+          update: { $set: { x: 1 }}
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          operationType: "update"
+          ns: { db: *database0Name, coll: *collection0Name }
+          updateDescription: { $$type: "object" }
+          fullDocument: null
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0Name
+                pipeline:
+                  - $changeStream: { fullDocument: "whenAvailable" }
+
+  - description: "fullDocument:required with changeStreamPreAndPostImages enabled"
+    operations:
+      - name: runCommand
+        object: *database0
+        arguments: *enablePreAndPostImages
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline: []
+          fullDocument: "required"
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: updateOne
+        object: *collection0
+        arguments:
+          filter: { _id: 1 }
+          update: { $set: { x: 1 }}
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          operationType: "update"
+          ns: { db: *database0Name, coll: *collection0Name }
+          updateDescription: { $$type: "object" }
+          fullDocument: { _id: 1, x: 1 }
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0Name
+                pipeline:
+                  - $changeStream: { fullDocument: "required" }
+
+  - description: "fullDocument:required with changeStreamPreAndPostImages disabled"
+    operations:
+      - name: runCommand
+        object: *database0
+        arguments: *disablePreAndPostImages
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline: []
+          fullDocument: "required"
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: updateOne
+        object: *collection0
+        arguments:
+          filter: { _id: 1 }
+          update: { $set: { x: 1 }}
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectError:
+          isClientError: false
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0Name
+                pipeline:
+                  - $changeStream: { fullDocument: "required" }
+
+  - description: "fullDocumentBeforeChange:whenAvailable with changeStreamPreAndPostImages enabled"
+    operations:
+      - name: runCommand
+        object: *database0
+        arguments: *enablePreAndPostImages
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline: []
+          fullDocumentBeforeChange: "whenAvailable"
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: updateOne
+        object: *collection0
+        arguments:
+          filter: { _id: 1 }
+          update: { $set: { x: 1 }}
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          operationType: "update"
+          ns: { db: *database0Name, coll: *collection0Name }
+          updateDescription: { $$type: "object" }
+          fullDocumentBeforeChange: { _id: 1 }
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0Name
+                pipeline:
+                  - $changeStream: { fullDocumentBeforeChange: "whenAvailable" }
+
+  - description: "fullDocumentBeforeChange:whenAvailable with changeStreamPreAndPostImages disabled"
+    operations:
+      - name: runCommand
+        object: *database0
+        arguments: *disablePreAndPostImages
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline: []
+          fullDocumentBeforeChange: "whenAvailable"
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: updateOne
+        object: *collection0
+        arguments:
+          filter: { _id: 1 }
+          update: { $set: { x: 1 }}
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          operationType: "update"
+          ns: { db: *database0Name, coll: *collection0Name }
+          updateDescription: { $$type: "object" }
+          fullDocumentBeforeChange: null
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0Name
+                pipeline:
+                  - $changeStream: { fullDocumentBeforeChange: "whenAvailable" }
+
+  - description: "fullDocumentBeforeChange:required with changeStreamPreAndPostImages enabled"
+    operations:
+      - name: runCommand
+        object: *database0
+        arguments: *enablePreAndPostImages
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline: []
+          fullDocumentBeforeChange: "required"
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: updateOne
+        object: *collection0
+        arguments:
+          filter: { _id: 1 }
+          update: { $set: { x: 1 }}
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          operationType: "update"
+          ns: { db: *database0Name, coll: *collection0Name }
+          updateDescription: { $$type: "object" }
+          fullDocumentBeforeChange: { _id: 1 }
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0Name
+                pipeline:
+                  - $changeStream: { fullDocumentBeforeChange: "required" }
+
+  - description: "fullDocumentBeforeChange:required with changeStreamPreAndPostImages disabled"
+    operations:
+      - name: runCommand
+        object: *database0
+        arguments: *disablePreAndPostImages
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline: []
+          fullDocumentBeforeChange: "required"
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: updateOne
+        object: *collection0
+        arguments:
+          filter: { _id: 1 }
+          update: { $set: { x: 1 }}
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectError:
+          isClientError: false
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0Name
+                pipeline:
+                  - $changeStream: { fullDocumentBeforeChange: "required" }
+
+  - description: "fullDocumentBeforeChange:off with changeStreamPreAndPostImages enabled"
+    operations:
+      - name: runCommand
+        object: *database0
+        arguments: *enablePreAndPostImages
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline: []
+          fullDocumentBeforeChange: "off"
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: updateOne
+        object: *collection0
+        arguments:
+          filter: { _id: 1 }
+          update: { $set: { x: 1 }}
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          operationType: "update"
+          ns: { db: *database0Name, coll: *collection0Name }
+          updateDescription: { $$type: "object" }
+          fullDocumentBeforeChange: { $$exists: false }
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0Name
+                pipeline:
+                  - $changeStream: { fullDocumentBeforeChange: "off" }
+
+  - description: "fullDocumentBeforeChange:off with changeStreamPreAndPostImages disabled"
+    operations:
+      - name: runCommand
+        object: *database0
+        arguments: *disablePreAndPostImages
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline: []
+          fullDocumentBeforeChange: "off"
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: updateOne
+        object: *collection0
+        arguments:
+          filter: { _id: 1 }
+          update: { $set: { x: 1 }}
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          operationType: "update"
+          ns: { db: *database0Name, coll: *collection0Name }
+          updateDescription: { $$type: "object" }
+          fullDocumentBeforeChange: { $$exists: false }
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0Name
+                pipeline:
+                  - $changeStream: { fullDocumentBeforeChange: "off" }
diff --git a/Tests/Specs/change-streams/tests/unified/change-streams-resume-allowlist.json b/Tests/Specs/change-streams/tests/unified/change-streams-resume-allowlist.json
new file mode 100644
index 000000000..b4953ec73
--- /dev/null
+++ b/Tests/Specs/change-streams/tests/unified/change-streams-resume-allowlist.json
@@ -0,0 +1,2348 @@
+{
+  "description": "change-streams-resume-allowlist",
+  "schemaVersion": "1.7",
+  "runOnRequirements": [
+    {
+      "minServerVersion": "3.6",
+      "topologies": [
+        "replicaset",
+        "sharded-replicaset",
+        "load-balanced"
+      ],
+      "serverless": "forbid"
+    }
+  ],
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0",
+        "observeEvents": [
+          "commandStartedEvent"
+        ],
+        "ignoreCommandMonitoringEvents": [
+          "killCursors"
+        ],
+        "useMultipleMongoses": false
+      }
+    },
+    {
+      "client": {
+        "id": "globalClient",
+        "useMultipleMongoses": false
+      }
+    },
+    {
+      "database": {
+        "id": "database0",
+        "client": "client0",
+        "databaseName": "database0"
+      }
+    },
+    {
+      "collection": {
+        "id": "collection0",
+        "database": "database0",
+        "collectionName": "collection0"
+      }
+    },
+    {
+      "database": {
+        "id": "globalDatabase0",
+        "client": "globalClient",
+        "databaseName": "database0"
+      }
+    },
+    {
+      "collection": {
+        "id": "globalCollection0",
+        "database": "globalDatabase0",
+        "collectionName": "collection0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "change stream resumes after a network error",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "4.2"
+        }
+      ],
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "getMore"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after HostUnreachable",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "4.2",
+          "maxServerVersion": "4.2.99"
+        }
+      ],
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "getMore"
+                ],
+                "errorCode": 6,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after HostNotFound",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "4.2",
+          "maxServerVersion": "4.2.99"
+        }
+      ],
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "getMore"
+                ],
+                "errorCode": 7,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after NetworkTimeout",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "4.2",
+          "maxServerVersion": "4.2.99"
+        }
+      ],
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "getMore"
+                ],
+                "errorCode": 89,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after ShutdownInProgress",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "4.2",
+          "maxServerVersion": "4.2.99"
+        }
+      ],
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "getMore"
+                ],
+                "errorCode": 91,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after PrimarySteppedDown",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "4.2",
+          "maxServerVersion": "4.2.99"
+        }
+      ],
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "getMore"
+                ],
+                "errorCode": 189,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after ExceededTimeLimit",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "4.2",
+          "maxServerVersion": "4.2.99"
+        }
+      ],
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "getMore"
+                ],
+                "errorCode": 262,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after SocketException",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "4.2",
+          "maxServerVersion": "4.2.99"
+        }
+      ],
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "getMore"
+                ],
+                "errorCode": 9001,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after NotWritablePrimary",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "4.2",
+          "maxServerVersion": "4.2.99"
+        }
+      ],
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "getMore"
+                ],
+                "errorCode": 10107,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after InterruptedAtShutdown",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "4.2",
+          "maxServerVersion": "4.2.99"
+        }
+      ],
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "getMore"
+                ],
+                "errorCode": 11600,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after InterruptedDueToReplStateChange",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "4.2",
+          "maxServerVersion": "4.2.99"
+        }
+      ],
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "getMore"
+                ],
+                "errorCode": 11602,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after NotPrimaryNoSecondaryOk",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "4.2",
+          "maxServerVersion": "4.2.99"
+        }
+      ],
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "getMore"
+                ],
+                "errorCode": 13435,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after NotPrimaryOrSecondary",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "4.2",
+          "maxServerVersion": "4.2.99"
+        }
+      ],
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "getMore"
+                ],
+                "errorCode": 13436,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after StaleShardVersion",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "4.2",
+          "maxServerVersion": "4.2.99"
+        }
+      ],
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "getMore"
+                ],
+                "errorCode": 63,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after StaleEpoch",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "4.2",
+          "maxServerVersion": "4.2.99"
+        }
+      ],
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "getMore"
+                ],
+                "errorCode": 150,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after RetryChangeStream",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "4.2",
+          "maxServerVersion": "4.2.99"
+        }
+      ],
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "getMore"
+                ],
+                "errorCode": 234,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after FailedToSatisfyReadPreference",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "4.2",
+          "maxServerVersion": "4.2.99"
+        }
+      ],
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "getMore"
+                ],
+                "errorCode": 133,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after CursorNotFound",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "4.2"
+        }
+      ],
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "getMore"
+                ],
+                "errorCode": 43,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/Tests/Specs/change-streams/tests/unified/change-streams-resume-allowlist.yml b/Tests/Specs/change-streams/tests/unified/change-streams-resume-allowlist.yml
new file mode 100644
index 000000000..5c69e2301
--- /dev/null
+++ b/Tests/Specs/change-streams/tests/unified/change-streams-resume-allowlist.yml
@@ -0,0 +1,1169 @@
+# Tests for resume behavior on server versions that do not support the ResumableChangeStreamError label
+description: "change-streams-resume-allowlist"
+
+schemaVersion: "1.7"
+
+runOnRequirements:
+  - minServerVersion: "3.6"
+    topologies: [ replicaset, sharded-replicaset, load-balanced ]
+    serverless: forbid
+
+createEntities:
+  - client:
+      id: &client0 client0
+      observeEvents: [ commandStartedEvent ]
+      ignoreCommandMonitoringEvents: [ killCursors ]
+      useMultipleMongoses: false
+  - client:
+      id: &globalClient globalClient
+      useMultipleMongoses: false
+  - database:
+      id: &database0 database0
+      client: *client0
+      databaseName: *database0
+  - collection:
+      id: &collection0 collection0
+      database: *database0
+      collectionName: *collection0
+  - database:
+      id: &globalDatabase0 globalDatabase0
+      client: *globalClient
+      databaseName: *database0
+  - collection:
+      id: &globalCollection0 globalCollection0
+      database: *globalDatabase0
+      collectionName: *collection0
+
+tests:
+  - description: change stream resumes after a network error
+    runOnRequirements:
+      - minServerVersion: "4.2"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ getMore ]
+              closeConnection: true
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after HostUnreachable
+    runOnRequirements:
+      - minServerVersion: "4.2"
+        maxServerVersion: "4.2.99"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ getMore ]
+              errorCode: 6
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after HostNotFound
+    runOnRequirements:
+      - minServerVersion: "4.2"
+        maxServerVersion: "4.2.99"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ getMore ]
+              errorCode: 7
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after NetworkTimeout
+    runOnRequirements:
+      - minServerVersion: "4.2"
+        maxServerVersion: "4.2.99"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ getMore ]
+              errorCode: 89
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after ShutdownInProgress
+    runOnRequirements:
+      - minServerVersion: "4.2"
+        maxServerVersion: "4.2.99"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ getMore ]
+              errorCode: 91
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after PrimarySteppedDown
+    runOnRequirements:
+      - minServerVersion: "4.2"
+        maxServerVersion: "4.2.99"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ getMore ]
+              errorCode: 189
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after ExceededTimeLimit
+    runOnRequirements:
+      - minServerVersion: "4.2"
+        maxServerVersion: "4.2.99"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ getMore ]
+              errorCode: 262
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after SocketException
+    runOnRequirements:
+      - minServerVersion: "4.2"
+        maxServerVersion: "4.2.99"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ getMore ]
+              errorCode: 9001
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after NotWritablePrimary
+    runOnRequirements:
+      - minServerVersion: "4.2"
+        maxServerVersion: "4.2.99"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ getMore ]
+              errorCode: 10107
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after InterruptedAtShutdown
+    runOnRequirements:
+      - minServerVersion: "4.2"
+        maxServerVersion: "4.2.99"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ getMore ]
+              errorCode: 11600
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after InterruptedDueToReplStateChange
+    runOnRequirements:
+      - minServerVersion: "4.2"
+        maxServerVersion: "4.2.99"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ getMore ]
+              errorCode: 11602
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after NotPrimaryNoSecondaryOk
+    runOnRequirements:
+      - minServerVersion: "4.2"
+        maxServerVersion: "4.2.99"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ getMore ]
+              errorCode: 13435
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after NotPrimaryOrSecondary
+    runOnRequirements:
+      - minServerVersion: "4.2"
+        maxServerVersion: "4.2.99"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ getMore ]
+              errorCode: 13436
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after StaleShardVersion
+    runOnRequirements:
+      - minServerVersion: "4.2"
+        maxServerVersion: "4.2.99"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ getMore ]
+              errorCode: 63
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after StaleEpoch
+    runOnRequirements:
+      - minServerVersion: "4.2"
+        maxServerVersion: "4.2.99"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ getMore ]
+              errorCode: 150
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after RetryChangeStream
+    runOnRequirements:
+      - minServerVersion: "4.2"
+        maxServerVersion: "4.2.99"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ getMore ]
+              errorCode: 234
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after FailedToSatisfyReadPreference
+    runOnRequirements:
+      - minServerVersion: "4.2"
+        maxServerVersion: "4.2.99"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ getMore ]
+              errorCode: 133
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+    # CursorNotFound is special-cased to be resumable regardless of server versions or error labels, so this test has
+    # no maxWireVersion.
+  - description: change stream resumes after CursorNotFound
+    runOnRequirements:
+      - minServerVersion: "4.2"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ getMore ]
+              errorCode: 43
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
diff --git a/Tests/Specs/change-streams/tests/unified/change-streams-resume-errorLabels.json b/Tests/Specs/change-streams/tests/unified/change-streams-resume-errorLabels.json
new file mode 100644
index 000000000..f5f4505a9
--- /dev/null
+++ b/Tests/Specs/change-streams/tests/unified/change-streams-resume-errorLabels.json
@@ -0,0 +1,2130 @@
+{
+  "description": "change-streams-resume-errorlabels",
+  "schemaVersion": "1.7",
+  "runOnRequirements": [
+    {
+      "minServerVersion": "4.3.1",
+      "topologies": [
+        "replicaset",
+        "sharded-replicaset",
+        "load-balanced"
+      ],
+      "serverless": "forbid"
+    }
+  ],
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0",
+        "observeEvents": [
+          "commandStartedEvent"
+        ],
+        "ignoreCommandMonitoringEvents": [
+          "killCursors"
+        ],
+        "useMultipleMongoses": false
+      }
+    },
+    {
+      "client": {
+        "id": "globalClient",
+        "useMultipleMongoses": false
+      }
+    },
+    {
+      "database": {
+        "id": "database0",
+        "client": "client0",
+        "databaseName": "database0"
+      }
+    },
+    {
+      "collection": {
+        "id": "collection0",
+        "database": "database0",
+        "collectionName": "collection0"
+      }
+    },
+    {
+      "database": {
+        "id": "globalDatabase0",
+        "client": "globalClient",
+        "databaseName": "database0"
+      }
+    },
+    {
+      "collection": {
+        "id": "globalCollection0",
+        "database": "globalDatabase0",
+        "collectionName": "collection0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "change stream resumes after HostUnreachable",
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failGetMoreAfterCursorCheckout",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "errorCode": 6,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after HostNotFound",
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failGetMoreAfterCursorCheckout",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "errorCode": 7,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after NetworkTimeout",
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failGetMoreAfterCursorCheckout",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "errorCode": 89,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after ShutdownInProgress",
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failGetMoreAfterCursorCheckout",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "errorCode": 91,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after PrimarySteppedDown",
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failGetMoreAfterCursorCheckout",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "errorCode": 189,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after ExceededTimeLimit",
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failGetMoreAfterCursorCheckout",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "errorCode": 262,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after SocketException",
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failGetMoreAfterCursorCheckout",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "errorCode": 9001,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after NotWritablePrimary",
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failGetMoreAfterCursorCheckout",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "errorCode": 10107,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after InterruptedAtShutdown",
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failGetMoreAfterCursorCheckout",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "errorCode": 11600,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after InterruptedDueToReplStateChange",
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failGetMoreAfterCursorCheckout",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "errorCode": 11602,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after NotPrimaryNoSecondaryOk",
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failGetMoreAfterCursorCheckout",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "errorCode": 13435,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after NotPrimaryOrSecondary",
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failGetMoreAfterCursorCheckout",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "errorCode": 13436,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after StaleShardVersion",
+      "runOnRequirements": [
+        {
+          "maxServerVersion": "6.0.99"
+        }
+      ],
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failGetMoreAfterCursorCheckout",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "errorCode": 63,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after StaleEpoch",
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failGetMoreAfterCursorCheckout",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "errorCode": 150,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after RetryChangeStream",
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failGetMoreAfterCursorCheckout",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "errorCode": 234,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes after FailedToSatisfyReadPreference",
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failGetMoreAfterCursorCheckout",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "errorCode": 133,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream resumes if error contains ResumableChangeStreamError",
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "getMore"
+                ],
+                "errorCode": 50,
+                "closeConnection": false,
+                "errorLabels": [
+                  "ResumableChangeStreamError"
+                ]
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "_id": {
+              "$$exists": true
+            },
+            "documentKey": {
+              "$$exists": true
+            },
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "fullDocument": {
+              "x": 1,
+              "_id": {
+                "$$exists": true
+              }
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {}
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "getMore": {
+                    "$$exists": true
+                  },
+                  "collection": "collection0"
+                },
+                "commandName": "getMore",
+                "databaseName": "database0"
+              }
+            },
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "resumeAfter": {
+                          "$$unsetOrMatches": {
+                            "$$exists": true
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "change stream does not resume if error does not contain ResumableChangeStreamError",
+      "operations": [
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "globalClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "getMore"
+                ],
+                "errorCode": 6,
+                "closeConnection": false
+              }
+            }
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "globalCollection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectError": {
+            "errorCode": 6
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/Tests/Specs/change-streams/tests/unified/change-streams-resume-errorLabels.yml b/Tests/Specs/change-streams/tests/unified/change-streams-resume-errorLabels.yml
new file mode 100644
index 000000000..5879b59c6
--- /dev/null
+++ b/Tests/Specs/change-streams/tests/unified/change-streams-resume-errorLabels.yml
@@ -0,0 +1,1069 @@
+# Tests for resume behavior on server versions that support the ResumableChangeStreamError label
+description: "change-streams-resume-errorlabels"
+
+schemaVersion: "1.7"
+
+runOnRequirements:
+  - minServerVersion: "4.3.1"
+    topologies: [ replicaset, sharded-replicaset, load-balanced ]
+    serverless: forbid
+
+createEntities:
+  - client:
+      id: &client0 client0
+      observeEvents: [ commandStartedEvent ]
+      ignoreCommandMonitoringEvents: [ killCursors ]
+      useMultipleMongoses: false
+  - client:
+      id: &globalClient globalClient
+      useMultipleMongoses: false
+  - database:
+      id: &database0 database0
+      client: *client0
+      databaseName: *database0
+  - collection:
+      id: &collection0 collection0
+      database: *database0
+      collectionName: *collection0
+  - database:
+      id: &globalDatabase0 globalDatabase0
+      client: *globalClient
+      databaseName: *database0
+  - collection:
+      id: &globalCollection0 globalCollection0
+      database: *globalDatabase0
+      collectionName: *collection0
+
+tests:
+  - description: change stream resumes after HostUnreachable
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failGetMoreAfterCursorCheckout # SERVER-46091 explains why a new failpoint was needed
+            mode: { times: 1 }
+            data:
+              errorCode: 6
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after HostNotFound
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failGetMoreAfterCursorCheckout
+            mode: { times: 1 }
+            data:
+              errorCode: 7
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after NetworkTimeout
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failGetMoreAfterCursorCheckout
+            mode: { times: 1 }
+            data:
+              errorCode: 89
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+
+  - description: change stream resumes after ShutdownInProgress
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failGetMoreAfterCursorCheckout
+            mode: { times: 1 }
+            data:
+              errorCode: 91
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after PrimarySteppedDown
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failGetMoreAfterCursorCheckout
+            mode: { times: 1 }
+            data:
+              errorCode: 189
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after ExceededTimeLimit
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failGetMoreAfterCursorCheckout
+            mode: { times: 1 }
+            data:
+              errorCode: 262
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after SocketException
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failGetMoreAfterCursorCheckout
+            mode: { times: 1 }
+            data:
+              errorCode: 9001
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after NotWritablePrimary
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failGetMoreAfterCursorCheckout
+            mode: { times: 1 }
+            data:
+              errorCode: 10107
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after InterruptedAtShutdown
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failGetMoreAfterCursorCheckout
+            mode: { times: 1 }
+            data:
+              errorCode: 11600
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after InterruptedDueToReplStateChange
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failGetMoreAfterCursorCheckout
+            mode: { times: 1 }
+            data:
+              errorCode: 11602
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after NotPrimaryNoSecondaryOk
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failGetMoreAfterCursorCheckout
+            mode: { times: 1 }
+            data:
+              errorCode: 13435
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after NotPrimaryOrSecondary
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failGetMoreAfterCursorCheckout
+            mode: { times: 1 }
+            data:
+              errorCode: 13436
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after StaleShardVersion
+    runOnRequirements:
+      # StaleShardVersion is obsolete as of 6.1 and is no longer marked as resumable.
+      - maxServerVersion: "6.0.99"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failGetMoreAfterCursorCheckout
+            mode: { times: 1 }
+            data:
+              errorCode: 63
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after StaleEpoch
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failGetMoreAfterCursorCheckout
+            mode: { times: 1 }
+            data:
+              errorCode: 150
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after RetryChangeStream
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failGetMoreAfterCursorCheckout
+            mode: { times: 1 }
+            data:
+              errorCode: 234
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream resumes after FailedToSatisfyReadPreference
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failGetMoreAfterCursorCheckout
+            mode: { times: 1 }
+            data:
+              errorCode: 133
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  # The next two tests ensure that the driver only uses the error label, not the allow list.
+  - description: change stream resumes if error contains ResumableChangeStreamError
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ getMore ]
+              errorCode: 50 # Use an error code that does not have the allow list label by default
+              closeConnection: false
+              errorLabels: [ ResumableChangeStreamError ]
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          _id: { $$exists: true }
+          documentKey: { $$exists: true }
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          fullDocument:
+            x: 1
+            _id: { $$exists: true }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline: [ { $changeStream: {} } ]
+              commandName: aggregate
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                getMore: { $$exists: true }
+                collection: *collection0
+              commandName: getMore
+              databaseName: *database0
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      resumeAfter: { $$unsetOrMatches: { $$exists: true } }
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: change stream does not resume if error does not contain ResumableChangeStreamError
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *globalClient
+          failPoint:
+            configureFailPoint: failCommand # failCommand will not add the allow list error label
+            mode: { times: 1 }
+            data:
+              failCommands: [ getMore ]
+              errorCode: 6 # Use an error code that is on the allow list
+              closeConnection: false
+      - name: createChangeStream
+        object: *collection0
+        arguments: { pipeline: [] }
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *globalCollection0
+        arguments:
+          document: { x: 1 }
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectError: { errorCode: 6 }
diff --git a/Tests/Specs/change-streams/tests/unified/change-streams-showExpandedEvents.json b/Tests/Specs/change-streams/tests/unified/change-streams-showExpandedEvents.json
new file mode 100644
index 000000000..fe852b544
--- /dev/null
+++ b/Tests/Specs/change-streams/tests/unified/change-streams-showExpandedEvents.json
@@ -0,0 +1,509 @@
+{
+  "description": "change-streams-showExpandedEvents",
+  "schemaVersion": "1.7",
+  "runOnRequirements": [
+    {
+      "minServerVersion": "6.0.0",
+      "topologies": [
+        "replicaset",
+        "sharded-replicaset",
+        "sharded"
+      ]
+    }
+  ],
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0",
+        "observeEvents": [
+          "commandStartedEvent"
+        ],
+        "ignoreCommandMonitoringEvents": [
+          "killCursors"
+        ],
+        "useMultipleMongoses": false
+      }
+    },
+    {
+      "database": {
+        "id": "database0",
+        "client": "client0",
+        "databaseName": "database0"
+      }
+    },
+    {
+      "collection": {
+        "id": "collection0",
+        "database": "database0",
+        "collectionName": "collection0"
+      }
+    },
+    {
+      "database": {
+        "id": "database1",
+        "client": "client0",
+        "databaseName": "database1"
+      }
+    },
+    {
+      "collection": {
+        "id": "collection1",
+        "database": "database1",
+        "collectionName": "collection1"
+      }
+    },
+    {
+      "database": {
+        "id": "shardedDb",
+        "client": "client0",
+        "databaseName": "shardedDb"
+      }
+    },
+    {
+      "database": {
+        "id": "adminDb",
+        "client": "client0",
+        "databaseName": "admin"
+      }
+    },
+    {
+      "collection": {
+        "id": "shardedCollection",
+        "database": "shardedDb",
+        "collectionName": "shardedCollection"
+      }
+    }
+  ],
+  "initialData": [
+    {
+      "collectionName": "collection0",
+      "databaseName": "database0",
+      "documents": []
+    }
+  ],
+  "tests": [
+    {
+      "description": "when provided, showExpandedEvents is sent as a part of the aggregate command",
+      "operations": [
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": [],
+            "showExpandedEvents": true
+          },
+          "saveResultAsEntity": "changeStream0"
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "showExpandedEvents": true
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "when omitted, showExpandedEvents is not sent as a part of the aggregate command",
+      "operations": [
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": []
+          },
+          "saveResultAsEntity": "changeStream0"
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "collection0",
+                  "cursor": {},
+                  "pipeline": [
+                    {
+                      "$changeStream": {
+                        "showExpandedEvents": {
+                          "$$exists": false
+                        }
+                      }
+                    }
+                  ]
+                },
+                "commandName": "aggregate",
+                "databaseName": "database0"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "when showExpandedEvents is true, new fields on change stream events are handled appropriately",
+      "operations": [
+        {
+          "name": "dropCollection",
+          "object": "database0",
+          "arguments": {
+            "collection": "foo"
+          }
+        },
+        {
+          "name": "createCollection",
+          "object": "database0",
+          "arguments": {
+            "collection": "foo"
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": [],
+            "showExpandedEvents": true
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection0",
+          "arguments": {
+            "document": {
+              "a": 1
+            }
+          }
+        },
+        {
+          "name": "createIndex",
+          "object": "collection0",
+          "arguments": {
+            "keys": {
+              "x": 1
+            },
+            "name": "x_1"
+          }
+        },
+        {
+          "name": "rename",
+          "object": "collection0",
+          "arguments": {
+            "to": "foo",
+            "dropTarget": true
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "operationType": "insert",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "collectionUUID": {
+              "$$exists": true
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "operationType": "createIndexes",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "operationDescription": {
+              "$$exists": true
+            }
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "operationType": "rename",
+            "ns": {
+              "db": "database0",
+              "coll": "collection0"
+            },
+            "to": {
+              "db": "database0",
+              "coll": "foo"
+            },
+            "operationDescription": {
+              "dropTarget": {
+                "$$exists": true
+              },
+              "to": {
+                "db": "database0",
+                "coll": "foo"
+              }
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "when showExpandedEvents is true, createIndex events are reported",
+      "operations": [
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": [],
+            "showExpandedEvents": true
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "createIndex",
+          "object": "collection0",
+          "arguments": {
+            "keys": {
+              "x": 1
+            },
+            "name": "x_1"
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "operationType": "createIndexes"
+          }
+        }
+      ]
+    },
+    {
+      "description": "when showExpandedEvents is true, dropIndexes events are reported",
+      "operations": [
+        {
+          "name": "createIndex",
+          "object": "collection0",
+          "arguments": {
+            "keys": {
+              "x": 1
+            },
+            "name": "x_1"
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": [],
+            "showExpandedEvents": true
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "dropIndex",
+          "object": "collection0",
+          "arguments": {
+            "name": "x_1"
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "operationType": "dropIndexes"
+          }
+        }
+      ]
+    },
+    {
+      "description": "when showExpandedEvents is true, create events are reported",
+      "operations": [
+        {
+          "name": "dropCollection",
+          "object": "database0",
+          "arguments": {
+            "collection": "foo"
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "database0",
+          "arguments": {
+            "pipeline": [],
+            "showExpandedEvents": true
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "createCollection",
+          "object": "database0",
+          "arguments": {
+            "collection": "foo"
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "operationType": "create"
+          }
+        }
+      ]
+    },
+    {
+      "description": "when showExpandedEvents is true, create events on views are reported",
+      "operations": [
+        {
+          "name": "dropCollection",
+          "object": "database0",
+          "arguments": {
+            "collection": "foo"
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "database0",
+          "arguments": {
+            "pipeline": [],
+            "showExpandedEvents": true
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "createCollection",
+          "object": "database0",
+          "arguments": {
+            "collection": "foo",
+            "viewOn": "testName"
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "operationType": "create"
+          }
+        }
+      ]
+    },
+    {
+      "description": "when showExpandedEvents is true, modify events are reported",
+      "operations": [
+        {
+          "name": "createIndex",
+          "object": "collection0",
+          "arguments": {
+            "keys": {
+              "x": 1
+            },
+            "name": "x_2"
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": [],
+            "showExpandedEvents": true
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "runCommand",
+          "object": "database0",
+          "arguments": {
+            "command": {
+              "collMod": "collection0"
+            },
+            "commandName": "collMod"
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "operationType": "modify"
+          }
+        }
+      ]
+    },
+    {
+      "description": "when showExpandedEvents is true, shardCollection events are reported",
+      "runOnRequirements": [
+        {
+          "topologies": [
+            "sharded-replicaset",
+            "sharded"
+          ]
+        }
+      ],
+      "operations": [
+        {
+          "name": "dropCollection",
+          "object": "shardedDb",
+          "arguments": {
+            "collection": "shardedCollection"
+          }
+        },
+        {
+          "name": "createCollection",
+          "object": "shardedDb",
+          "arguments": {
+            "collection": "shardedCollection"
+          }
+        },
+        {
+          "name": "createChangeStream",
+          "object": "shardedCollection",
+          "arguments": {
+            "pipeline": [],
+            "showExpandedEvents": true
+          },
+          "saveResultAsEntity": "changeStream0"
+        },
+        {
+          "name": "runCommand",
+          "object": "adminDb",
+          "arguments": {
+            "command": {
+              "shardCollection": "shardedDb.shardedCollection",
+              "key": {
+                "_id": 1
+              }
+            },
+            "commandName": "shardCollection"
+          }
+        },
+        {
+          "name": "iterateUntilDocumentOrError",
+          "object": "changeStream0",
+          "expectResult": {
+            "operationType": "shardCollection"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/Tests/Specs/change-streams/tests/unified/change-streams-showExpandedEvents.yml b/Tests/Specs/change-streams/tests/unified/change-streams-showExpandedEvents.yml
new file mode 100644
index 000000000..002e17ed3
--- /dev/null
+++ b/Tests/Specs/change-streams/tests/unified/change-streams-showExpandedEvents.yml
@@ -0,0 +1,297 @@
+description: "change-streams-showExpandedEvents"
+schemaVersion: "1.7"
+runOnRequirements:
+  - minServerVersion: "6.0.0"
+    topologies: [ replicaset, sharded-replicaset, sharded ]
+createEntities:
+  - client:
+      id: &client0 client0
+      observeEvents: [ commandStartedEvent ]
+      ignoreCommandMonitoringEvents: [ killCursors ]
+      useMultipleMongoses: false
+  - database:
+      id: &database0 database0
+      client: *client0
+      databaseName: *database0
+  - collection:
+      id: &collection0 collection0
+      database: *database0
+      collectionName: *collection0
+  - database:
+      id: &database1 database1
+      client: *client0
+      databaseName: *database1
+  - collection:
+      id: &collection1 collection1
+      database: *database1
+      collectionName: *collection1
+  - database:
+      id: &shardedDb shardedDb
+      client: *client0
+      databaseName: *shardedDb
+  - database:
+      id: &adminDb adminDb
+      client: *client0
+      databaseName: admin
+  - collection:
+      id: &shardedCollection shardedCollection
+      database: *shardedDb
+      collectionName: *shardedCollection
+
+initialData:
+  - collectionName: *collection0
+    databaseName: *database0
+    documents: []
+
+tests:
+  - description: "when provided, showExpandedEvents is sent as a part of the aggregate command"
+    operations:
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline: []
+          showExpandedEvents: true
+        saveResultAsEntity: &changeStream0 changeStream0
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      showExpandedEvents: true
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: "when omitted, showExpandedEvents is not sent as a part of the aggregate command"
+    operations:
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline: []
+        saveResultAsEntity: &changeStream0 changeStream0
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: {}
+                pipeline:
+                  - $changeStream:
+                      showExpandedEvents:
+                        $$exists: false
+              commandName: aggregate
+              databaseName: *database0
+
+  - description: "when showExpandedEvents is true, new fields on change stream events are handled appropriately"
+    operations:
+      - name: dropCollection
+        object: *database0
+        arguments:
+          collection: &existing-collection foo
+      - name: createCollection
+        object: *database0
+        arguments:
+          collection: *existing-collection
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline: []
+          showExpandedEvents: true
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *collection0
+        arguments:
+          document:
+            a: 1
+      - name: createIndex
+        object: *collection0
+        arguments:
+          keys:
+            x: 1
+          name: x_1
+      - name: rename
+        object: *collection0
+        arguments:
+          to: *existing-collection
+          dropTarget: true
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          operationType: insert
+          ns:
+            db: *database0
+            coll: *collection0
+          collectionUUID:
+            $$exists: true
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          operationType: createIndexes
+          ns:
+            db: *database0
+            coll: *collection0
+          operationDescription:
+            $$exists: true
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          operationType: rename
+          ns:
+            db: *database0
+            coll: *collection0
+          to:
+            db: *database0
+            coll: *existing-collection
+          operationDescription:
+            dropTarget:
+              $$exists: true
+            to:
+              db: *database0
+              coll: *existing-collection
+
+  - description: "when showExpandedEvents is true, createIndex events are reported"
+    operations:
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline: []
+          showExpandedEvents: true
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: createIndex
+        object: *collection0
+        arguments:
+          keys:
+            x: 1
+          name: x_1
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          operationType: createIndexes
+
+  - description: "when showExpandedEvents is true, dropIndexes events are reported"
+    operations:
+      - name: createIndex
+        object: *collection0
+        arguments:
+          keys:
+            x: 1
+          name: &index1 x_1
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline: []
+          showExpandedEvents: true
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: dropIndex
+        object: *collection0
+        arguments:
+          name: *index1
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          operationType: dropIndexes
+
+  - description: "when showExpandedEvents is true, create events are reported"
+    operations:
+      - name: dropCollection
+        object: *database0
+        arguments:
+          collection: &collection1 foo
+      - name: createChangeStream
+        object: *database0
+        arguments:
+          pipeline: []
+          showExpandedEvents: true
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: createCollection
+        object: *database0
+        arguments:
+          collection: *collection1
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          operationType: create
+
+  - description: "when showExpandedEvents is true, create events on views are reported"
+    operations:
+      - name: dropCollection
+        object: *database0
+        arguments:
+          collection: &collection1 foo
+      - name: createChangeStream
+        object: *database0
+        arguments:
+          pipeline: []
+          showExpandedEvents: true
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: createCollection
+        object: *database0
+        arguments:
+          collection: *collection1
+          viewOn: testName
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          operationType: create
+
+  - description: "when showExpandedEvents is true, modify events are reported"
+    operations:
+      - name: createIndex
+        object: *collection0
+        arguments:
+          keys:
+            x: 1
+          name: &index2 x_2
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline: []
+          showExpandedEvents: true
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: runCommand
+        object: *database0
+        arguments:
+          command:
+            collMod: *collection0
+          commandName: collMod
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          operationType: modify
+
+  - description: "when showExpandedEvents is true, shardCollection events are reported"
+    runOnRequirements:
+      - topologies: [ sharded-replicaset, sharded ]
+    operations:
+      - name: dropCollection
+        object: *shardedDb
+        arguments:
+          collection: *shardedCollection
+      - name: createCollection
+        object: *shardedDb
+        arguments:
+          collection: *shardedCollection
+      - name: createChangeStream
+        object: *shardedCollection
+        arguments:
+          pipeline: []
+          showExpandedEvents: true
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: runCommand
+        object: *adminDb
+        arguments:
+          command:
+            shardCollection: shardedDb.shardedCollection
+            key:
+              _id: 1
+          commandName: shardCollection
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult:
+          operationType: shardCollection