diff --git a/source/change-streams/tests/README.md b/source/change-streams/tests/README.md
index 9813731591..3804168576 100644
--- a/source/change-streams/tests/README.md
+++ b/source/change-streams/tests/README.md
@@ -194,23 +194,13 @@ and sharded clusters unless otherwise specified:
 
 11. For a `ChangeStream` under these conditions:
 
-    - Running against a server `>=4.0.7`.
     - The batch is empty or has been iterated to the last document.
 
     Expected result:
 
     - `getResumeToken` must return the `postBatchResumeToken` from the current command response.
 
-12. For a `ChangeStream` under these conditions:
-
-    - Running against a server `<4.0.7`.
-    - The batch is empty or has been iterated to the last document.
-
-    Expected result:
-
-    - `getResumeToken` must return the `_id` of the last document returned if one exists.
-    - `getResumeToken` must return `resumeAfter` from the initial aggregate if the option was specified.
-    - If `resumeAfter` was not specified, the `getResumeToken` result must be empty.
+12. **Removed**
 
 13. For a `ChangeStream` under these conditions:
 
diff --git a/source/server-discovery-and-monitoring/tests/rs/null_election_id-pre-6.0.json b/source/server-discovery-and-monitoring/tests/rs/null_election_id-pre-6.0.json
index 7261fbfc2a..8a77f31c50 100644
--- a/source/server-discovery-and-monitoring/tests/rs/null_election_id-pre-6.0.json
+++ b/source/server-discovery-and-monitoring/tests/rs/null_election_id-pre-6.0.json
@@ -18,7 +18,7 @@
             "setVersion": 1,
             "setName": "rs",
             "minWireVersion": 0,
-            "maxWireVersion": 7
+            "maxWireVersion": 16
           }
         ]
       ],
@@ -66,7 +66,7 @@
               "$oid": "000000000000000000000002"
             },
             "minWireVersion": 0,
-            "maxWireVersion": 7
+            "maxWireVersion": 16
           }
         ]
       ],
@@ -116,7 +116,7 @@
             "setVersion": 1,
             "setName": "rs",
             "minWireVersion": 0,
-            "maxWireVersion": 7
+            "maxWireVersion": 16
           }
         ]
       ],
@@ -167,7 +167,7 @@
               "$oid": "000000000000000000000001"
             },
             "minWireVersion": 0,
-            "maxWireVersion": 7
+            "maxWireVersion": 16
           }
         ]
       ],
diff --git a/source/server-discovery-and-monitoring/tests/rs/null_election_id-pre-6.0.yml b/source/server-discovery-and-monitoring/tests/rs/null_election_id-pre-6.0.yml
index 63f9699f22..5313a8adf3 100644
--- a/source/server-discovery-and-monitoring/tests/rs/null_election_id-pre-6.0.yml
+++ b/source/server-discovery-and-monitoring/tests/rs/null_election_id-pre-6.0.yml
@@ -15,7 +15,7 @@ phases: [
                 setVersion: 1,
                 setName: "rs",
                 minWireVersion: 0,
-                maxWireVersion: 7
+                maxWireVersion: 16
             }]
         ],
 
@@ -57,7 +57,7 @@ phases: [
                 setVersion: 1,
                 electionId: {"$oid": "000000000000000000000002"},
                 minWireVersion: 0,
-                maxWireVersion: 7
+                maxWireVersion: 16
             }]
         ],
 
@@ -99,7 +99,7 @@ phases: [
                 setVersion: 1,
                 setName: "rs",
                 minWireVersion: 0,
-                maxWireVersion: 7
+                maxWireVersion: 16
             }]
         ],
         outcome: {
@@ -142,7 +142,7 @@ phases: [
                 setVersion: 1,
                 electionId: {"$oid": "000000000000000000000001"},
                 minWireVersion: 0,
-                maxWireVersion: 7
+                maxWireVersion: 16
             }]
         ],
         outcome: {
diff --git a/source/server-discovery-and-monitoring/tests/rs/primary_mismatched_me_not_removed.json b/source/server-discovery-and-monitoring/tests/rs/primary_mismatched_me_not_removed.json
index 4c40093659..a55dcfc6d4 100644
--- a/source/server-discovery-and-monitoring/tests/rs/primary_mismatched_me_not_removed.json
+++ b/source/server-discovery-and-monitoring/tests/rs/primary_mismatched_me_not_removed.json
@@ -18,7 +18,7 @@
             "primary": "localhost:27017",
             "me": "a:27017",
             "minWireVersion": 0,
-            "maxWireVersion": 7
+            "maxWireVersion": 25
           }
         ]
       ],
@@ -55,7 +55,7 @@
             "primary": "localhost:27017",
             "me": "localhost:27018",
             "minWireVersion": 0,
-            "maxWireVersion": 7
+            "maxWireVersion": 25
           }
         ]
       ],
diff --git a/source/server-discovery-and-monitoring/tests/rs/primary_mismatched_me_not_removed.yml b/source/server-discovery-and-monitoring/tests/rs/primary_mismatched_me_not_removed.yml
index 5b7e92e603..ae0c3bb506 100644
--- a/source/server-discovery-and-monitoring/tests/rs/primary_mismatched_me_not_removed.yml
+++ b/source/server-discovery-and-monitoring/tests/rs/primary_mismatched_me_not_removed.yml
@@ -19,7 +19,7 @@ phases: [
         # servers from a primary isWritablePrimary are added to the working server set
         me: "a:27017",
         minWireVersion: 0,
-        maxWireVersion: 7
+        maxWireVersion: 25
       }]
     ],
     outcome: {
@@ -53,7 +53,7 @@ phases: [
         primary: "localhost:27017",
         me: "localhost:27018",
         minWireVersion: 0,
-        maxWireVersion: 7
+        maxWireVersion: 25
       }]
     ],
     outcome: {
diff --git a/source/server-discovery-and-monitoring/tests/rs/setversion_without_electionid-pre-6.0.json b/source/server-discovery-and-monitoring/tests/rs/setversion_without_electionid-pre-6.0.json
index 87029e578b..9a1ee61399 100644
--- a/source/server-discovery-and-monitoring/tests/rs/setversion_without_electionid-pre-6.0.json
+++ b/source/server-discovery-and-monitoring/tests/rs/setversion_without_electionid-pre-6.0.json
@@ -17,7 +17,7 @@
             "setName": "rs",
             "setVersion": 2,
             "minWireVersion": 0,
-            "maxWireVersion": 7
+            "maxWireVersion": 16
           }
         ]
       ],
@@ -56,7 +56,7 @@
             "setName": "rs",
             "setVersion": 1,
             "minWireVersion": 0,
-            "maxWireVersion": 7
+            "maxWireVersion": 16
           }
         ]
       ],
diff --git a/source/server-discovery-and-monitoring/tests/rs/setversion_without_electionid-pre-6.0.yml b/source/server-discovery-and-monitoring/tests/rs/setversion_without_electionid-pre-6.0.yml
index 0fd735dcc5..41a89e0fb3 100644
--- a/source/server-discovery-and-monitoring/tests/rs/setversion_without_electionid-pre-6.0.yml
+++ b/source/server-discovery-and-monitoring/tests/rs/setversion_without_electionid-pre-6.0.yml
@@ -15,7 +15,7 @@ phases: [
                 setName: "rs",
                 setVersion: 2,
                 minWireVersion: 0,
-                maxWireVersion: 7
+                maxWireVersion: 16
             }]
         ],
 
@@ -52,7 +52,7 @@ phases: [
                 setName: "rs",
                 setVersion: 1,
                 minWireVersion: 0,
-                maxWireVersion: 7
+                maxWireVersion: 16
             }]
         ],
 
diff --git a/source/server-discovery-and-monitoring/tests/rs/use_setversion_without_electionid-pre-6.0.json b/source/server-discovery-and-monitoring/tests/rs/use_setversion_without_electionid-pre-6.0.json
index a63efeac12..03195aacde 100644
--- a/source/server-discovery-and-monitoring/tests/rs/use_setversion_without_electionid-pre-6.0.json
+++ b/source/server-discovery-and-monitoring/tests/rs/use_setversion_without_electionid-pre-6.0.json
@@ -20,7 +20,7 @@
               "$oid": "000000000000000000000001"
             },
             "minWireVersion": 0,
-            "maxWireVersion": 7
+            "maxWireVersion": 16
           }
         ]
       ],
@@ -64,7 +64,7 @@
             "setName": "rs",
             "setVersion": 2,
             "minWireVersion": 0,
-            "maxWireVersion": 7
+            "maxWireVersion": 16
           }
         ]
       ],
@@ -109,7 +109,7 @@
               "$oid": "000000000000000000000002"
             },
             "minWireVersion": 0,
-            "maxWireVersion": 7
+            "maxWireVersion": 16
           }
         ]
       ],
diff --git a/source/server-discovery-and-monitoring/tests/rs/use_setversion_without_electionid-pre-6.0.yml b/source/server-discovery-and-monitoring/tests/rs/use_setversion_without_electionid-pre-6.0.yml
index d02fba5d52..4849b01fcd 100644
--- a/source/server-discovery-and-monitoring/tests/rs/use_setversion_without_electionid-pre-6.0.yml
+++ b/source/server-discovery-and-monitoring/tests/rs/use_setversion_without_electionid-pre-6.0.yml
@@ -16,7 +16,7 @@ phases: [
                 setVersion: 1,
                 electionId: {"$oid": "000000000000000000000001"},
                 minWireVersion: 0,
-                maxWireVersion: 7
+                maxWireVersion: 16
             }]
         ],
 
@@ -53,7 +53,7 @@ phases: [
                 setName: "rs",
                 setVersion: 2,
                 minWireVersion: 0,
-                maxWireVersion: 7
+                maxWireVersion: 16
             }]
         ],
 
@@ -92,7 +92,7 @@ phases: [
                 setVersion: 1,
                 electionId: {"$oid": "000000000000000000000002"},
                 minWireVersion: 0,
-                maxWireVersion: 7
+                maxWireVersion: 16
             }]
         ],
         outcome: {