diff --git a/test/crud/unified/insertMany-dots_and_dollars.json b/test/crud/unified/insertMany-dots_and_dollars.json
index 3b66ac062..eed8997df 100644
--- a/test/crud/unified/insertMany-dots_and_dollars.json
+++ b/test/crud/unified/insertMany-dots_and_dollars.json
@@ -53,10 +53,11 @@
             ]
           },
           "expectResult": {
-            "insertedCount": 1,
-            "insertedIds": {
-              "$$unsetOrMatches": {
-                "0": 1
+            "$$unsetOrMatches": {
+              "insertedIds": {
+                "$$unsetOrMatches": {
+                  "0": 1
+                }
               }
             }
           }
@@ -162,10 +163,11 @@
             ]
           },
           "expectResult": {
-            "insertedCount": 1,
-            "insertedIds": {
-              "$$unsetOrMatches": {
-                "0": 1
+            "$$unsetOrMatches": {
+              "insertedIds": {
+                "$$unsetOrMatches": {
+                  "0": 1
+                }
               }
             }
           }
@@ -221,10 +223,11 @@
             ]
           },
           "expectResult": {
-            "insertedCount": 1,
-            "insertedIds": {
-              "$$unsetOrMatches": {
-                "0": 1
+            "$$unsetOrMatches": {
+              "insertedIds": {
+                "$$unsetOrMatches": {
+                  "0": 1
+                }
               }
             }
           }
@@ -284,10 +287,11 @@
             ]
           },
           "expectResult": {
-            "insertedCount": 1,
-            "insertedIds": {
-              "$$unsetOrMatches": {
-                "0": 1
+            "$$unsetOrMatches": {
+              "insertedIds": {
+                "$$unsetOrMatches": {
+                  "0": 1
+                }
               }
             }
           }
diff --git a/test/crud/unified/insertOne-dots_and_dollars.json b/test/crud/unified/insertOne-dots_and_dollars.json
index 1a30df4a0..fdc17af2e 100644
--- a/test/crud/unified/insertOne-dots_and_dollars.json
+++ b/test/crud/unified/insertOne-dots_and_dollars.json
@@ -63,9 +63,10 @@
             }
           },
           "expectResult": {
-            "insertedCount": 1,
-            "insertedId": {
-              "$$unsetOrMatches": 1
+            "$$unsetOrMatches": {
+              "insertedId": {
+                "$$unsetOrMatches": 1
+              }
             }
           }
         }
@@ -166,9 +167,10 @@
             }
           },
           "expectResult": {
-            "insertedCount": 1,
-            "insertedId": {
-              "$$unsetOrMatches": 1
+            "$$unsetOrMatches": {
+              "insertedId": {
+                "$$unsetOrMatches": 1
+              }
             }
           }
         }
@@ -221,9 +223,10 @@
             }
           },
           "expectResult": {
-            "insertedCount": 1,
-            "insertedId": {
-              "$$unsetOrMatches": 1
+            "$$unsetOrMatches": {
+              "insertedId": {
+                "$$unsetOrMatches": 1
+              }
             }
           }
         }
@@ -280,9 +283,10 @@
             }
           },
           "expectResult": {
-            "insertedCount": 1,
-            "insertedId": {
-              "$$unsetOrMatches": 1
+            "$$unsetOrMatches": {
+              "insertedId": {
+                "$$unsetOrMatches": 1
+              }
             }
           }
         }
@@ -390,10 +394,11 @@
             }
           },
           "expectResult": {
-            "insertedCount": 1,
-            "insertedId": {
-              "$$unsetOrMatches": {
-                "a.b": 1
+            "$$unsetOrMatches": {
+              "insertedId": {
+                "$$unsetOrMatches": {
+                  "a.b": 1
+                }
               }
             }
           }
@@ -501,9 +506,10 @@
             }
           },
           "expectResult": {
-            "insertedCount": 1,
-            "insertedId": {
-              "$$unsetOrMatches": 1
+            "$$unsetOrMatches": {
+              "insertedId": {
+                "$$unsetOrMatches": 1
+              }
             }
           }
         }
@@ -564,8 +570,10 @@
             }
           },
           "expectResult": {
-            "acknowledged": {
-              "$$unsetOrMatches": false
+            "$$unsetOrMatches": {
+              "acknowledged": {
+                "$$unsetOrMatches": false
+              }
             }
           }
         }
diff --git a/test/unified-test-format/valid-pass/poc-crud.json b/test/unified-test-format/valid-pass/poc-crud.json
index 2ed86d615..7bb072de8 100644
--- a/test/unified-test-format/valid-pass/poc-crud.json
+++ b/test/unified-test-format/valid-pass/poc-crud.json
@@ -1,6 +1,6 @@
 {
   "description": "poc-crud",
-  "schemaVersion": "1.0",
+  "schemaVersion": "1.4",
   "createEntities": [
     {
       "client": {
@@ -242,12 +242,14 @@
           },
           "expectError": {
             "expectResult": {
-              "deletedCount": 0,
-              "insertedCount": 2,
-              "matchedCount": 0,
-              "modifiedCount": 0,
-              "upsertedCount": 0,
-              "upsertedIds": {}
+              "$$unsetOrMatches": {
+                "deletedCount": 0,
+                "insertedCount": 2,
+                "matchedCount": 0,
+                "modifiedCount": 0,
+                "upsertedCount": 0,
+                "upsertedIds": {}
+              }
             }
           }
         }
@@ -406,7 +408,8 @@
       "description": "Aggregate with $listLocalSessions",
       "runOnRequirements": [
         {
-          "minServerVersion": "3.6.0"
+          "minServerVersion": "3.6.0",
+          "serverless": "forbid"
         }
       ],
       "operations": [
diff --git a/test/unified-test-format/valid-pass/poc-retryable-writes.json b/test/unified-test-format/valid-pass/poc-retryable-writes.json
index 30c1d5415..50160799f 100644
--- a/test/unified-test-format/valid-pass/poc-retryable-writes.json
+++ b/test/unified-test-format/valid-pass/poc-retryable-writes.json
@@ -298,9 +298,6 @@
           },
           "expectResult": {
             "$$unsetOrMatches": {
-              "insertedCount": {
-                "$$unsetOrMatches": 2
-              },
               "insertedIds": {
                 "$$unsetOrMatches": {
                   "0": 3,
diff --git a/test/unified_format.py b/test/unified_format.py
index 8623ffb0f..e402e20ae 100644
--- a/test/unified_format.py
+++ b/test/unified_format.py
@@ -612,11 +612,9 @@ def coerce_result(opname, result):
     if opname == 'bulkWrite':
         return parse_bulk_write_result(result)
     if opname == 'insertOne':
-        return {'insertedId': result.inserted_id, 'insertedCount': 1}
+        return {'insertedId': result.inserted_id}
     if opname == 'insertMany':
-        res = {idx: _id for idx, _id in enumerate(result.inserted_ids)}
-        res['insertedCount'] = len(result.inserted_ids)
-        return res
+        return {idx: _id for idx, _id in enumerate(result.inserted_ids)}
     if opname in ('deleteOne', 'deleteMany'):
         return {'deletedCount': result.deleted_count}
     if opname in ('updateOne', 'updateMany', 'replaceOne'):