diff --git a/source/open-telemetry/tests/operation/atlas_search.json b/source/open-telemetry/tests/operation/atlas_search.json
index 820f2f5074..715dca6f38 100644
--- a/source/open-telemetry/tests/operation/atlas_search.json
+++ b/source/open-telemetry/tests/operation/atlas_search.json
@@ -123,9 +123,6 @@
                         "string"
                       ]
                     },
-                    "server.type": {
-                      "$$type": "string"
-                    },
                     "db.query.summary": "createSearchIndexes operation-atlas-search.test",
                     "db.query.text": {
                       "$$matchAsDocument": {
@@ -173,9 +170,6 @@
                         "string"
                       ]
                     },
-                    "server.type": {
-                      "$$type": "string"
-                    },
                     "db.query.summary": "updateSearchIndex operation-atlas-search.test",
                     "db.query.text": {
                       "$$matchAsDocument": {
@@ -215,9 +209,6 @@
                         "string"
                       ]
                     },
-                    "server.type": {
-                      "$$type": "string"
-                    },
                     "db.query.summary": "dropSearchIndex operation-atlas-search.test",
                     "db.query.text": {
                       "$$matchAsDocument": {
diff --git a/source/open-telemetry/tests/operation/atlas_search.yml b/source/open-telemetry/tests/operation/atlas_search.yml
index 9800d9be35..e72e5f06af 100644
--- a/source/open-telemetry/tests/operation/atlas_search.yml
+++ b/source/open-telemetry/tests/operation/atlas_search.yml
@@ -83,7 +83,6 @@ tests:
                   db.collection.name: test
                   server.address: { $$type: string }
                   server.port: { $$type: [ long, string ] }
-                  server.type: { $$type: string }
                   db.query.summary: createSearchIndexes operation-atlas-search.test
                   db.query.text:
                     $$matchAsDocument:
@@ -106,7 +105,6 @@ tests:
                   db.collection.name: test
                   server.address: { $$type: string }
                   server.port: { $$type: [ long, string ] }
-                  server.type: { $$type: string }
                   db.query.summary: updateSearchIndex operation-atlas-search.test
                   db.query.text:
                     $$matchAsDocument:
@@ -130,7 +128,6 @@ tests:
                   db.collection.name: test
                   server.address: { $$type: string }
                   server.port: { $$type: [ long, string ] }
-                  server.type: { $$type: string }
                   db.query.summary: dropSearchIndex operation-atlas-search.test
                   db.query.text:
                     $$matchAsDocument:
diff --git a/source/open-telemetry/tests/operation/bulk_write.json b/source/open-telemetry/tests/operation/bulk_write.json
index bf9d4d9b65..6f1e62004a 100644
--- a/source/open-telemetry/tests/operation/bulk_write.json
+++ b/source/open-telemetry/tests/operation/bulk_write.json
@@ -211,9 +211,6 @@
                         "long"
                       ]
                     },
-                    "server.type": {
-                      "$$type": "string"
-                    },
                     "db.query.summary": "bulkWrite admin",
                     "db.query.text": {
                       "$$matchAsDocument": {
diff --git a/source/open-telemetry/tests/operation/bulk_write.yml b/source/open-telemetry/tests/operation/bulk_write.yml
index 54f3ba2b79..6f84e50fb1 100644
--- a/source/open-telemetry/tests/operation/bulk_write.yml
+++ b/source/open-telemetry/tests/operation/bulk_write.yml
@@ -97,7 +97,6 @@ tests:
                   exception.stacktrace: { $$exists: false }
                   server.address: { $$type: string }
                   server.port: { $$type: [ int, long ] }
-                  server.type: { $$type: string }
                   db.query.summary: bulkWrite admin
                   db.query.text:
                     $$matchAsDocument:
diff --git a/source/open-telemetry/tests/operation/drop_collection.json b/source/open-telemetry/tests/operation/drop_collection.json
index ce4ffe686a..fbffed165b 100644
--- a/source/open-telemetry/tests/operation/drop_collection.json
+++ b/source/open-telemetry/tests/operation/drop_collection.json
@@ -1,6 +1,11 @@
 {
   "description": "operation drop collection",
   "schemaVersion": "1.27",
+  "runOnRequirements": [
+    {
+      "minServerVersion": "7.0"
+    }
+  ],
   "createEntities": [
     {
       "client": {
diff --git a/source/open-telemetry/tests/operation/drop_collection.yml b/source/open-telemetry/tests/operation/drop_collection.yml
index 26c33715df..bc4afbc004 100644
--- a/source/open-telemetry/tests/operation/drop_collection.yml
+++ b/source/open-telemetry/tests/operation/drop_collection.yml
@@ -1,5 +1,9 @@
 description: operation drop collection
 schemaVersion: '1.27'
+
+runOnRequirements:
+  - minServerVersion: "7.0"
+
 createEntities:
   - client:
       id: &client0 client0
diff --git a/source/open-telemetry/tests/operation/find.json b/source/open-telemetry/tests/operation/find.json
index 53dfcb1d24..b0b089e146 100644
--- a/source/open-telemetry/tests/operation/find.json
+++ b/source/open-telemetry/tests/operation/find.json
@@ -94,9 +94,6 @@
                         "long"
                       ]
                     },
-                    "server.type": {
-                      "$$type": "string"
-                    },
                     "db.query.summary": "find operation-find.test",
                     "db.query.text": {
                       "$$matchAsDocument": {
@@ -208,9 +205,6 @@
                         "string"
                       ]
                     },
-                    "server.type": {
-                      "$$type": "string"
-                    },
                     "db.query.summary": "find operation-find.test",
                     "db.query.text": {
                       "$$matchAsDocument": {
@@ -268,9 +262,6 @@
                         "long"
                       ]
                     },
-                    "server.type": {
-                      "$$type": "string"
-                    },
                     "db.query.summary": "find operation-find.test",
                     "db.query.text": {
                       "$$matchAsDocument": {
diff --git a/source/open-telemetry/tests/operation/find.yml b/source/open-telemetry/tests/operation/find.yml
index 82f42b90cf..debf75ac3c 100644
--- a/source/open-telemetry/tests/operation/find.yml
+++ b/source/open-telemetry/tests/operation/find.yml
@@ -51,7 +51,6 @@ tests:
                   exception.stacktrace: { $$exists: false }
                   server.address: { $$type: string }
                   server.port: { $$type: [int, long] }
-                  server.type: { $$type: string }
                   db.query.summary: find operation-find.test
                   db.query.text:
                     $$matchAsDocument:
@@ -108,7 +107,6 @@ tests:
                   exception.stacktrace: { $$type: string }
                   server.address: { $$type: string }
                   server.port: { $$type: [ long, string ] }
-                  server.type: { $$type: string }
                   db.query.summary: find operation-find.test
                   db.query.text:
                     $$matchAsDocument:
@@ -134,7 +132,6 @@ tests:
                   exception.stacktrace: { $$exists: false }
                   server.address: { $$type: string }
                   server.port: { $$type: [ int, long ] }
-                  server.type: { $$type: string }
                   db.query.summary: find operation-find.test
                   db.query.text:
                     $$matchAsDocument:
diff --git a/source/open-telemetry/tests/operation/find_and_modify.json b/source/open-telemetry/tests/operation/find_and_modify.json
index 20d5958498..71b5a66683 100644
--- a/source/open-telemetry/tests/operation/find_and_modify.json
+++ b/source/open-telemetry/tests/operation/find_and_modify.json
@@ -29,6 +29,11 @@
   "tests": [
     {
       "description": "findOneAndUpdate",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "4.4"
+        }
+      ],
       "operations": [
         {
           "name": "findOneAndUpdate",
diff --git a/source/open-telemetry/tests/operation/find_and_modify.yml b/source/open-telemetry/tests/operation/find_and_modify.yml
index d36cd053d8..23183e961b 100644
--- a/source/open-telemetry/tests/operation/find_and_modify.yml
+++ b/source/open-telemetry/tests/operation/find_and_modify.yml
@@ -17,6 +17,8 @@ createEntities:
 
 tests:
   - description: findOneAndUpdate
+    runOnRequirements:
+      - minServerVersion: "4.4"
     operations:
       - name: findOneAndUpdate
         object: *collection0
diff --git a/source/open-telemetry/tests/operation/find_without_query_text.json b/source/open-telemetry/tests/operation/find_without_query_text.json
index df50865cef..05163e7249 100644
--- a/source/open-telemetry/tests/operation/find_without_query_text.json
+++ b/source/open-telemetry/tests/operation/find_without_query_text.json
@@ -94,9 +94,6 @@
                         "long"
                       ]
                     },
-                    "server.type": {
-                      "$$type": "string"
-                    },
                     "db.query.summary": "find operation-find.test",
                     "db.query.text": {
                       "$$exists": false
diff --git a/source/open-telemetry/tests/operation/find_without_query_text.yml b/source/open-telemetry/tests/operation/find_without_query_text.yml
index 26b53b979d..68658e5686 100644
--- a/source/open-telemetry/tests/operation/find_without_query_text.yml
+++ b/source/open-telemetry/tests/operation/find_without_query_text.yml
@@ -51,6 +51,5 @@ tests:
                   exception.stacktrace: { $$exists: false }
                   server.address: { $$type: string }
                   server.port: { $$type: [int, long] }
-                  server.type: { $$type: string }
                   db.query.summary: find operation-find.test
                   db.query.text: { $$exists: false }
diff --git a/source/open-telemetry/tests/operation/insert.json b/source/open-telemetry/tests/operation/insert.json
index 52e659e1d0..b96d0ca7de 100644
--- a/source/open-telemetry/tests/operation/insert.json
+++ b/source/open-telemetry/tests/operation/insert.json
@@ -76,16 +76,15 @@
                         "string"
                       ]
                     },
-                    "server.type": {
-                      "$$type": "string"
-                    },
                     "db.query.summary": "insert operation-insert.test",
                     "db.query.text": {
                       "$$matchAsDocument": {
                         "$$matchAsRoot": {
                           "insert": "test",
                           "ordered": true,
-                          "txnNumber": 1,
+                          "txnNumber": {
+                            "$$unsetOrMatches": 1
+                          },
                           "documents": [
                             {
                               "_id": 1
diff --git a/source/open-telemetry/tests/operation/insert.yml b/source/open-telemetry/tests/operation/insert.yml
index 15019edafc..b1f16c9b4c 100644
--- a/source/open-telemetry/tests/operation/insert.yml
+++ b/source/open-telemetry/tests/operation/insert.yml
@@ -43,14 +43,13 @@ tests:
                   db.namespace: operation-insert
                   server.address: { $$type: string }
                   server.port: { $$type: [ long, string ] }
-                  server.type: { $$type: string }
                   db.query.summary: insert operation-insert.test
                   db.query.text:
                     $$matchAsDocument:
                       $$matchAsRoot:
                         insert: test
                         ordered: true
-                        txnNumber: 1
+                        txnNumber: { $$unsetOrMatches: 1 }
                         documents:
                           - _id: 1
 
diff --git a/source/open-telemetry/tests/operation/list_collections.json b/source/open-telemetry/tests/operation/list_collections.json
index 3d064c3dfc..637acda8f7 100644
--- a/source/open-telemetry/tests/operation/list_collections.json
+++ b/source/open-telemetry/tests/operation/list_collections.json
@@ -77,8 +77,7 @@
                     "db.query.text": {
                       "$$matchAsDocument": {
                         "$$matchAsRoot": {
-                          "listCollections": 1,
-                          "cursor": {}
+                          "listCollections": 1
                         }
                       }
                     },
diff --git a/source/open-telemetry/tests/operation/list_collections.yml b/source/open-telemetry/tests/operation/list_collections.yml
index 20c9afa5ea..91243dc44d 100644
--- a/source/open-telemetry/tests/operation/list_collections.yml
+++ b/source/open-telemetry/tests/operation/list_collections.yml
@@ -45,7 +45,6 @@ tests:
                      $$matchAsDocument:
                        $$matchAsRoot:
                          listCollections: 1
-                         cursor: {}
                    db.mongodb.server_connection_id:
                      $$type: [ int, long ]
                    db.mongodb.driver_connection_id:
diff --git a/source/open-telemetry/tests/operation/map_reduce.json b/source/open-telemetry/tests/operation/map_reduce.json
index d5ae4f677a..fbe0972af7 100644
--- a/source/open-telemetry/tests/operation/map_reduce.json
+++ b/source/open-telemetry/tests/operation/map_reduce.json
@@ -136,9 +136,6 @@
                         "long"
                       ]
                     },
-                    "server.type": {
-                      "$$type": "string"
-                    },
                     "db.query.summary": "mapReduce operation-map-reduce.test",
                     "db.query.text": {
                       "$$matchAsDocument": {
diff --git a/source/open-telemetry/tests/operation/map_reduce.yml b/source/open-telemetry/tests/operation/map_reduce.yml
index d96756f9fb..f1e310296c 100644
--- a/source/open-telemetry/tests/operation/map_reduce.yml
+++ b/source/open-telemetry/tests/operation/map_reduce.yml
@@ -84,7 +84,6 @@ tests:
                   exception.stacktrace: { $$exists: false }
                   server.address: { $$type: string }
                   server.port: { $$type: [ int, long ] }
-                  server.type: { $$type: string }
                   db.query.summary: mapReduce operation-map-reduce.test
                   db.query.text:
                     $$matchAsDocument:
diff --git a/source/open-telemetry/tests/operation/update.json b/source/open-telemetry/tests/operation/update.json
index 869812fb6e..2ad8911989 100644
--- a/source/open-telemetry/tests/operation/update.json
+++ b/source/open-telemetry/tests/operation/update.json
@@ -80,7 +80,9 @@
                         "$$matchAsRoot": {
                           "update": "test",
                           "ordered": true,
-                          "txnNumber": 1,
+                          "txnNumber": {
+                            "$$unsetOrMatches": 1
+                          },
                           "updates": [
                             {
                               "q": {
diff --git a/source/open-telemetry/tests/operation/update.yml b/source/open-telemetry/tests/operation/update.yml
index 1d8e38e3ac..a45a4ad5e7 100644
--- a/source/open-telemetry/tests/operation/update.yml
+++ b/source/open-telemetry/tests/operation/update.yml
@@ -49,5 +49,5 @@ tests:
                       $$matchAsRoot:
                         update: test
                         ordered: true
-                        txnNumber: 1
+                        txnNumber: { $$unsetOrMatches: 1 }
                         updates: [ { "q": { "_id": 1 }, "u": { "$inc": { "x": 1 } } } ]
diff --git a/source/open-telemetry/tests/transaction/convenient.json b/source/open-telemetry/tests/transaction/convenient.json
index f3d8994d74..baf5a4f3a7 100644
--- a/source/open-telemetry/tests/transaction/convenient.json
+++ b/source/open-telemetry/tests/transaction/convenient.json
@@ -116,9 +116,6 @@
                             "string"
                           ]
                         },
-                        "server.type": {
-                          "$$type": "string"
-                        },
                         "db.query.summary": "insert convenient-transaction-tests.test",
                         "db.mongodb.lsid": {
                           "$$sessionLsid": "session"
@@ -210,9 +207,6 @@
                         "string"
                       ]
                     },
-                    "server.type": {
-                      "$$type": "string"
-                    },
                     "db.query.summary": "find convenient-transaction-tests.test"
                   }
                 }
diff --git a/source/open-telemetry/tests/transaction/convenient.yml b/source/open-telemetry/tests/transaction/convenient.yml
index a9b09cd696..5b9e117f4b 100644
--- a/source/open-telemetry/tests/transaction/convenient.yml
+++ b/source/open-telemetry/tests/transaction/convenient.yml
@@ -69,7 +69,6 @@ tests:
                       db.collection.name: *collectionName
                       server.address: { $$type: string }
                       server.port: { $$type: [ 'long', 'string' ] }
-                      server.type: { $$type: string }
                       db.query.summary: insert convenient-transaction-tests.test
                       db.mongodb.lsid: { $$sessionLsid: *session }
                       db.mongodb.txn_number: 1
@@ -122,7 +121,6 @@ tests:
                   db.command.name: find
                   server.address: { $$type: string }
                   server.port: { $$type: [ 'long', 'string' ] }
-                  server.type: { $$type: string }
                   db.query.summary: find convenient-transaction-tests.test
 
     outcome:
diff --git a/source/open-telemetry/tests/transaction/core_api.json b/source/open-telemetry/tests/transaction/core_api.json
index 5491c9d660..f1ceaabc9e 100644
--- a/source/open-telemetry/tests/transaction/core_api.json
+++ b/source/open-telemetry/tests/transaction/core_api.json
@@ -122,9 +122,6 @@
                             "string"
                           ]
                         },
-                        "server.type": {
-                          "$$type": "string"
-                        },
                         "db.query.summary": "insert transaction-tests.test",
                         "db.mongodb.lsid": {
                           "$$sessionLsid": "session0"
@@ -216,9 +213,6 @@
                         "string"
                       ]
                     },
-                    "server.type": {
-                      "$$type": "string"
-                    },
                     "db.query.summary": "find transaction-tests.test"
                   }
                 }
@@ -297,9 +291,6 @@
                             "string"
                           ]
                         },
-                        "server.type": {
-                          "$$type": "string"
-                        },
                         "db.query.summary": "insert transaction-tests.test",
                         "db.mongodb.lsid": {
                           "$$sessionLsid": "session0"
diff --git a/source/open-telemetry/tests/transaction/core_api.yml b/source/open-telemetry/tests/transaction/core_api.yml
index 63ce1e93dc..b47458231f 100644
--- a/source/open-telemetry/tests/transaction/core_api.yml
+++ b/source/open-telemetry/tests/transaction/core_api.yml
@@ -69,7 +69,6 @@ tests:
                       db.collection.name: test
                       server.address: { $$type: string }
                       server.port: { $$type: ['long', 'string'] }
-                      server.type: { $$type: string }
                       db.query.summary: insert transaction-tests.test
                       db.mongodb.lsid: { $$sessionLsid: *session0 }
                       db.mongodb.txn_number: 1
@@ -121,7 +120,6 @@ tests:
                   db.command.name: find
                   server.address: { $$type: string }
                   server.port: { $$type: ['long', 'string'] }
-                  server.type: { $$type: string }
                   db.query.summary: find transaction-tests.test
     outcome:
       - collectionName: test
@@ -165,7 +163,6 @@ tests:
                       db.collection.name: test
                       server.address: { $$type: string }
                       server.port: { $$type: ['long', 'string'] }
-                      server.type: { $$type: string }
                       db.query.summary: insert transaction-tests.test
                       db.mongodb.lsid: { $$sessionLsid: *session0 }
                       db.mongodb.txn_number: 1