diff --git a/test/unified-test-format/invalid/entity-client-observeLogMessages-minProperties.json b/test/unified-test-format/invalid/entity-client-observeLogMessages-minProperties.json
new file mode 100644
index 0000000000..87cbd21125
--- /dev/null
+++ b/test/unified-test-format/invalid/entity-client-observeLogMessages-minProperties.json
@@ -0,0 +1,18 @@
+{
+  "description": "entity-client-observeLogMessages-minProperties",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0",
+        "observeLogMessages": {}
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": []
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/entity-client-observeLogMessages-property-type.json b/test/unified-test-format/invalid/entity-client-observeLogMessages-property-type.json
new file mode 100644
index 0000000000..fed0accd6e
--- /dev/null
+++ b/test/unified-test-format/invalid/entity-client-observeLogMessages-property-type.json
@@ -0,0 +1,20 @@
+{
+  "description": "entity-client-observeLogMessages-property-type",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0",
+        "observeLogMessages": {
+          "command": {}
+        }
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": []
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/entity-client-observeLogMessages-property-value.json b/test/unified-test-format/invalid/entity-client-observeLogMessages-property-value.json
new file mode 100644
index 0000000000..f14b18d6de
--- /dev/null
+++ b/test/unified-test-format/invalid/entity-client-observeLogMessages-property-value.json
@@ -0,0 +1,20 @@
+{
+  "description": "entity-client-observeLogMessages-property-type",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0",
+        "observeLogMessages": {
+          "command": "notALogLevel"
+        }
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": []
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/entity-client-observeLogMessages-type.json b/test/unified-test-format/invalid/entity-client-observeLogMessages-type.json
new file mode 100644
index 0000000000..8a277034e2
--- /dev/null
+++ b/test/unified-test-format/invalid/entity-client-observeLogMessages-type.json
@@ -0,0 +1,18 @@
+{
+  "description": "entity-client-observeLogMessages-type",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0",
+        "observeLogMessages": 0
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": []
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/expectedCmapEvent-poolClearedEvent-interruptInUseConnections-type.json b/test/unified-test-format/invalid/expectedCmapEvent-poolClearedEvent-interruptInUseConnections-type.json
index e25955a0e2..de59318822 100644
--- a/test/unified-test-format/invalid/expectedCmapEvent-poolClearedEvent-interruptInUseConnections-type.json
+++ b/test/unified-test-format/invalid/expectedCmapEvent-poolClearedEvent-interruptInUseConnections-type.json
@@ -20,4 +20,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/test/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-databaseName-type.json b/test/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-databaseName-type.json
new file mode 100644
index 0000000000..f6a305b89a
--- /dev/null
+++ b/test/unified-test-format/invalid/expectedCommandEvent-commandFailedEvent-databaseName-type.json
@@ -0,0 +1,29 @@
+{
+  "description": "expectedCommandEvent-commandFailedEvent-databaseName-type",
+  "schemaVersion": "1.15",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "events": [
+            {
+              "commandFailedEvent": {
+                "databaseName": 0
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-databaseName-type.json b/test/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-databaseName-type.json
new file mode 100644
index 0000000000..47b8c8bb9d
--- /dev/null
+++ b/test/unified-test-format/invalid/expectedCommandEvent-commandSucceededEvent-databaseName-type.json
@@ -0,0 +1,29 @@
+{
+  "description": "expectedCommandEvent-commandSucceededEvent-databaseName-type",
+  "schemaVersion": "1.15",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "events": [
+            {
+              "commandSucceededEvent": {
+                "databaseName": 0
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/expectedLogMessage-additionalProperties.json b/test/unified-test-format/invalid/expectedLogMessage-additionalProperties.json
new file mode 100644
index 0000000000..cd7cf8726c
--- /dev/null
+++ b/test/unified-test-format/invalid/expectedLogMessage-additionalProperties.json
@@ -0,0 +1,24 @@
+{
+  "description": "expectedLogMessage-additionalProperties",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectLogMessages": [
+        {
+          "client": "client0",
+          "messages": [],
+          "foo": 0
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/expectedLogMessage-component-enum.json b/test/unified-test-format/invalid/expectedLogMessage-component-enum.json
new file mode 100644
index 0000000000..2283e9b243
--- /dev/null
+++ b/test/unified-test-format/invalid/expectedLogMessage-component-enum.json
@@ -0,0 +1,29 @@
+{
+  "description": "expectedLogMessage-component-enum",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectLogMessages": [
+        {
+          "client": "client0",
+          "messages": [
+            {
+              "level": "debug",
+              "component": "foo",
+              "data": {}
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/expectedLogMessage-component-required.json b/test/unified-test-format/invalid/expectedLogMessage-component-required.json
new file mode 100644
index 0000000000..f3a157787f
--- /dev/null
+++ b/test/unified-test-format/invalid/expectedLogMessage-component-required.json
@@ -0,0 +1,28 @@
+{
+  "description": "expectedLogMessage-component-type",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectLogMessages": [
+        {
+          "client": "client0",
+          "messages": [
+            {
+              "level": "debug",
+              "data": {}
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/expectedLogMessage-component-type.json b/test/unified-test-format/invalid/expectedLogMessage-component-type.json
new file mode 100644
index 0000000000..af8f711573
--- /dev/null
+++ b/test/unified-test-format/invalid/expectedLogMessage-component-type.json
@@ -0,0 +1,29 @@
+{
+  "description": "expectedLogMessage-component-type",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectLogMessages": [
+        {
+          "client": "client0",
+          "messages": [
+            {
+              "level": "debug",
+              "component": 0,
+              "data": {}
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/expectedLogMessage-data-required.json b/test/unified-test-format/invalid/expectedLogMessage-data-required.json
new file mode 100644
index 0000000000..7e8152dddd
--- /dev/null
+++ b/test/unified-test-format/invalid/expectedLogMessage-data-required.json
@@ -0,0 +1,28 @@
+{
+  "description": "expectedLogMessage-data-required",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectLogMessages": [
+        {
+          "client": "client0",
+          "messages": [
+            {
+              "level": "debug",
+              "component": "command"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/expectedLogMessage-data-type.json b/test/unified-test-format/invalid/expectedLogMessage-data-type.json
new file mode 100644
index 0000000000..4f81fb6272
--- /dev/null
+++ b/test/unified-test-format/invalid/expectedLogMessage-data-type.json
@@ -0,0 +1,29 @@
+{
+  "description": "expectedLogMessage-data-type",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectLogMessages": [
+        {
+          "client": "client0",
+          "messages": [
+            {
+              "level": "debug",
+              "component": "command",
+              "data": 0
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/expectedLogMessage-failureIsRedacted-type.json b/test/unified-test-format/invalid/expectedLogMessage-failureIsRedacted-type.json
new file mode 100644
index 0000000000..190748a185
--- /dev/null
+++ b/test/unified-test-format/invalid/expectedLogMessage-failureIsRedacted-type.json
@@ -0,0 +1,30 @@
+{
+  "description": "expectedLogMessage-failureIsRedacted-type",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectLogMessages": [
+        {
+          "client": "client0",
+          "messages": [
+            {
+              "level": "debug",
+              "component": "command",
+              "failureIsRedacted": 0,
+              "data": {}
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/expectedLogMessage-level-enum.json b/test/unified-test-format/invalid/expectedLogMessage-level-enum.json
new file mode 100644
index 0000000000..f4c886bb68
--- /dev/null
+++ b/test/unified-test-format/invalid/expectedLogMessage-level-enum.json
@@ -0,0 +1,29 @@
+{
+  "description": "expectedLogMessage-level-enum",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectLogMessages": [
+        {
+          "client": "client0",
+          "messages": [
+            {
+              "level": "foo",
+              "component": "command",
+              "data": {}
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/expectedLogMessage-level-required.json b/test/unified-test-format/invalid/expectedLogMessage-level-required.json
new file mode 100644
index 0000000000..27c9c7a6cd
--- /dev/null
+++ b/test/unified-test-format/invalid/expectedLogMessage-level-required.json
@@ -0,0 +1,28 @@
+{
+  "description": "expectedLogMessage-level-required",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectLogMessages": [
+        {
+          "client": "client0",
+          "messages": [
+            {
+              "component": "command",
+              "data": {}
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/expectedLogMessage-level-type.json b/test/unified-test-format/invalid/expectedLogMessage-level-type.json
new file mode 100644
index 0000000000..180d7afcd6
--- /dev/null
+++ b/test/unified-test-format/invalid/expectedLogMessage-level-type.json
@@ -0,0 +1,29 @@
+{
+  "description": "expectedLogMessage-level-type",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectLogMessages": [
+        {
+          "client": "client0",
+          "messages": [
+            {
+              "level": 0,
+              "component": "command",
+              "data": {}
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/expectedLogMessagesForClient-additionalProperties.json b/test/unified-test-format/invalid/expectedLogMessagesForClient-additionalProperties.json
new file mode 100644
index 0000000000..306b78b446
--- /dev/null
+++ b/test/unified-test-format/invalid/expectedLogMessagesForClient-additionalProperties.json
@@ -0,0 +1,24 @@
+{
+  "description": "expectedLogMessagesForClient-additionalProperties",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectLogMessages": [
+        {
+          "client": "client0",
+          "messages": [],
+          "foo": 0
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/expectedLogMessagesForClient-client-required.json b/test/unified-test-format/invalid/expectedLogMessagesForClient-client-required.json
new file mode 100644
index 0000000000..d8e1100bea
--- /dev/null
+++ b/test/unified-test-format/invalid/expectedLogMessagesForClient-client-required.json
@@ -0,0 +1,22 @@
+{
+  "description": "expectedLogMessagesForClient-client-required",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectLogMessages": [
+        {
+          "messages": []
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/expectedLogMessagesForClient-client-type.json b/test/unified-test-format/invalid/expectedLogMessagesForClient-client-type.json
new file mode 100644
index 0000000000..5399cac029
--- /dev/null
+++ b/test/unified-test-format/invalid/expectedLogMessagesForClient-client-type.json
@@ -0,0 +1,23 @@
+{
+  "description": "expectedEventsForClient-client-type",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectLogMessages": [
+        {
+          "client": 0,
+          "messages": []
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/expectedLogMessagesForClient-ignoreExtraMessages-type.json b/test/unified-test-format/invalid/expectedLogMessagesForClient-ignoreExtraMessages-type.json
new file mode 100644
index 0000000000..a9f2da9bce
--- /dev/null
+++ b/test/unified-test-format/invalid/expectedLogMessagesForClient-ignoreExtraMessages-type.json
@@ -0,0 +1,24 @@
+{
+  "description": "expectedLogMessagesForClient-ignoreExtraMessages-type",
+  "schemaVersion": "1.16",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectLogMessages": [
+        {
+          "client": "client0",
+          "ignoreExtraMessages": "true",
+          "messages": []
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/expectedLogMessagesForClient-ignoreMessages-items.json b/test/unified-test-format/invalid/expectedLogMessagesForClient-ignoreMessages-items.json
new file mode 100644
index 0000000000..345faf41f5
--- /dev/null
+++ b/test/unified-test-format/invalid/expectedLogMessagesForClient-ignoreMessages-items.json
@@ -0,0 +1,26 @@
+{
+  "description": "expectedLogMessagesForClient-ignoreMessages-items",
+  "schemaVersion": "1.16",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectLogMessages": [
+        {
+          "client": "client0",
+          "messages": [],
+          "ignoreMessages": [
+            0
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/expectedLogMessagesForClient-ignoreMessages-type.json b/test/unified-test-format/invalid/expectedLogMessagesForClient-ignoreMessages-type.json
new file mode 100644
index 0000000000..4bc2d41dbf
--- /dev/null
+++ b/test/unified-test-format/invalid/expectedLogMessagesForClient-ignoreMessages-type.json
@@ -0,0 +1,24 @@
+{
+  "description": "expectedLogMessagesForClient-ignoreMessages-type",
+  "schemaVersion": "1.16",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectLogMessages": [
+        {
+          "client": "client0",
+          "messages": [],
+          "ignoreMessages": 0
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/expectedLogMessagesForClient-messages-items.json b/test/unified-test-format/invalid/expectedLogMessagesForClient-messages-items.json
new file mode 100644
index 0000000000..9788d8fe5c
--- /dev/null
+++ b/test/unified-test-format/invalid/expectedLogMessagesForClient-messages-items.json
@@ -0,0 +1,25 @@
+{
+  "description": "expectedLogMessagesForClient-messages-items",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectLogMessages": [
+        {
+          "client": "client0",
+          "messages": [
+            0
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/expectedLogMessagesForClient-messages-required.json b/test/unified-test-format/invalid/expectedLogMessagesForClient-messages-required.json
new file mode 100644
index 0000000000..85d070672f
--- /dev/null
+++ b/test/unified-test-format/invalid/expectedLogMessagesForClient-messages-required.json
@@ -0,0 +1,22 @@
+{
+  "description": "expectedLogMessagesForClient-messages-required",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectLogMessages": [
+        {
+          "client": "client0"
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/expectedLogMessagesForClient-messages-type.json b/test/unified-test-format/invalid/expectedLogMessagesForClient-messages-type.json
new file mode 100644
index 0000000000..27531667c5
--- /dev/null
+++ b/test/unified-test-format/invalid/expectedLogMessagesForClient-messages-type.json
@@ -0,0 +1,23 @@
+{
+  "description": "expectedLogMessagesForClient-messages-type",
+  "schemaVersion": "1.13",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectLogMessages": [
+        {
+          "client": "client0",
+          "messages": 0
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/expectedSdamEvent-topologyDescriptionChangedEvent-additionalProperties.json b/test/unified-test-format/invalid/expectedSdamEvent-topologyDescriptionChangedEvent-additionalProperties.json
new file mode 100644
index 0000000000..ef2686e93f
--- /dev/null
+++ b/test/unified-test-format/invalid/expectedSdamEvent-topologyDescriptionChangedEvent-additionalProperties.json
@@ -0,0 +1,23 @@
+{
+  "description": "expectedSdamEvent-topologyDescriptionChangedEvent-additionalProperties",
+  "schemaVersion": "1.14",
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "eventType": "sdam",
+          "events": [
+            {
+              "topologyDescriptionChangedEvent": {
+                "foo": "bar"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/runOnRequirement-authMechanism-type.json b/test/unified-test-format/invalid/runOnRequirement-authMechanism-type.json
new file mode 100644
index 0000000000..b97654a743
--- /dev/null
+++ b/test/unified-test-format/invalid/runOnRequirement-authMechanism-type.json
@@ -0,0 +1,17 @@
+{
+  "description": "runOnRequirement-authMechanism-type",
+  "schemaVersion": "1.19",
+  "runOnRequirements": [
+    {
+      "authMechanism": 0
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [
+
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/test-expectLogMessages-items.json b/test/unified-test-format/invalid/test-expectLogMessages-items.json
new file mode 100644
index 0000000000..be4a609c56
--- /dev/null
+++ b/test/unified-test-format/invalid/test-expectLogMessages-items.json
@@ -0,0 +1,13 @@
+{
+  "description": "test-expectLogMessages-items",
+  "schemaVersion": "1.13",
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectLogMessages": [
+        0
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/test-expectLogMessages-minItems.json b/test/unified-test-format/invalid/test-expectLogMessages-minItems.json
new file mode 100644
index 0000000000..d7a07c2e77
--- /dev/null
+++ b/test/unified-test-format/invalid/test-expectLogMessages-minItems.json
@@ -0,0 +1,11 @@
+{
+  "description": "test-expectLogMessages-minItems",
+  "schemaVersion": "1.11",
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectLogMessages": []
+    }
+  ]
+}
diff --git a/test/unified-test-format/invalid/test-expectLogMessages-type.json b/test/unified-test-format/invalid/test-expectLogMessages-type.json
new file mode 100644
index 0000000000..9a8d6fcdfb
--- /dev/null
+++ b/test/unified-test-format/invalid/test-expectLogMessages-type.json
@@ -0,0 +1,11 @@
+{
+  "description": "test-expectLogMessages-type",
+  "schemaVersion": "1.13",
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [],
+      "expectLogMessages": 0
+    }
+  ]
+}
diff --git a/test/unified-test-format/valid-pass/entity-cursor-iterateOnce.json b/test/unified-test-format/valid-pass/entity-cursor-iterateOnce.json
index 88fc28e34e..b17ae78b94 100644
--- a/test/unified-test-format/valid-pass/entity-cursor-iterateOnce.json
+++ b/test/unified-test-format/valid-pass/entity-cursor-iterateOnce.json
@@ -93,7 +93,10 @@
               "commandStartedEvent": {
                 "command": {
                   "getMore": {
-                    "$$type": "long"
+                    "$$type": [
+                      "int",
+                      "long"
+                    ]
                   },
                   "collection": "coll0"
                 },
diff --git a/test/unified-test-format/valid-pass/entity-find-cursor.json b/test/unified-test-format/valid-pass/entity-find-cursor.json
index 85b8f69d7f..6f955d81f4 100644
--- a/test/unified-test-format/valid-pass/entity-find-cursor.json
+++ b/test/unified-test-format/valid-pass/entity-find-cursor.json
@@ -109,7 +109,10 @@
                 "reply": {
                   "cursor": {
                     "id": {
-                      "$$type": "long"
+                      "$$type": [
+                        "int",
+                        "long"
+                      ]
                     },
                     "ns": {
                       "$$type": "string"
@@ -126,7 +129,10 @@
               "commandStartedEvent": {
                 "command": {
                   "getMore": {
-                    "$$type": "long"
+                    "$$type": [
+                      "int",
+                      "long"
+                    ]
                   },
                   "collection": "coll0"
                 },
@@ -138,7 +144,10 @@
                 "reply": {
                   "cursor": {
                     "id": {
-                      "$$type": "long"
+                      "$$type": [
+                        "int",
+                        "long"
+                      ]
                     },
                     "ns": {
                       "$$type": "string"
diff --git a/test/unified-test-format/valid-pass/expectedEventsForClient-topologyDescriptionChangedEvent.json b/test/unified-test-format/valid-pass/expectedEventsForClient-topologyDescriptionChangedEvent.json
new file mode 100644
index 0000000000..cf7bd60826
--- /dev/null
+++ b/test/unified-test-format/valid-pass/expectedEventsForClient-topologyDescriptionChangedEvent.json
@@ -0,0 +1,68 @@
+{
+  "description": "expectedEventsForClient-topologyDescriptionChangedEvent",
+  "schemaVersion": "1.20",
+  "runOnRequirements": [
+    {
+      "topologies": [
+        "replicaset"
+      ],
+      "minServerVersion": "4.4"
+    }
+  ],
+  "tests": [
+    {
+      "description": "can assert on values of newDescription and previousDescription fields",
+      "operations": [
+        {
+          "name": "createEntities",
+          "object": "testRunner",
+          "arguments": {
+            "entities": [
+              {
+                "client": {
+                  "id": "client",
+                  "uriOptions": {
+                    "directConnection": true
+                  },
+                  "observeEvents": [
+                    "topologyDescriptionChangedEvent"
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "waitForEvent",
+          "object": "testRunner",
+          "arguments": {
+            "client": "client",
+            "event": {
+              "topologyDescriptionChangedEvent": {}
+            },
+            "count": 1
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client",
+          "eventType": "sdam",
+          "ignoreExtraEvents": true,
+          "events": [
+            {
+              "topologyDescriptionChangedEvent": {
+                "previousDescription": {
+                  "type": "Unknown"
+                },
+                "newDescription": {
+                  "type": "Single"
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/unified-test-format/valid-pass/poc-crud.json b/test/unified-test-format/valid-pass/poc-crud.json
index 0790d9b789..94e4ec5682 100644
--- a/test/unified-test-format/valid-pass/poc-crud.json
+++ b/test/unified-test-format/valid-pass/poc-crud.json
@@ -322,7 +322,7 @@
           "minServerVersion": "4.1.0",
           "topologies": [
             "replicaset",
-            "sharded-replicaset"
+            "sharded"
           ],
           "serverless": "forbid"
         }
diff --git a/test/unified-test-format/valid-pass/poc-sessions.json b/test/unified-test-format/valid-pass/poc-sessions.json
index 75f3489428..117c9e7d00 100644
--- a/test/unified-test-format/valid-pass/poc-sessions.json
+++ b/test/unified-test-format/valid-pass/poc-sessions.json
@@ -264,7 +264,7 @@
         {
           "minServerVersion": "4.1.8",
           "topologies": [
-            "sharded-replicaset"
+            "sharded"
           ]
         }
       ],
diff --git a/test/unified-test-format/valid-pass/poc-transactions-convenient-api.json b/test/unified-test-format/valid-pass/poc-transactions-convenient-api.json
index 820ed65927..9ab44a9c54 100644
--- a/test/unified-test-format/valid-pass/poc-transactions-convenient-api.json
+++ b/test/unified-test-format/valid-pass/poc-transactions-convenient-api.json
@@ -11,7 +11,7 @@
     {
       "minServerVersion": "4.1.8",
       "topologies": [
-        "sharded-replicaset"
+        "sharded"
       ]
     }
   ],
diff --git a/test/unified-test-format/valid-pass/poc-transactions-mongos-pin-auto.json b/test/unified-test-format/valid-pass/poc-transactions-mongos-pin-auto.json
index a0b297d59a..de08edec44 100644
--- a/test/unified-test-format/valid-pass/poc-transactions-mongos-pin-auto.json
+++ b/test/unified-test-format/valid-pass/poc-transactions-mongos-pin-auto.json
@@ -5,7 +5,7 @@
     {
       "minServerVersion": "4.1.8",
       "topologies": [
-        "sharded-replicaset"
+        "sharded"
       ]
     }
   ],
diff --git a/test/unified-test-format/valid-pass/poc-transactions.json b/test/unified-test-format/valid-pass/poc-transactions.json
index 0355ca2060..2055a3b705 100644
--- a/test/unified-test-format/valid-pass/poc-transactions.json
+++ b/test/unified-test-format/valid-pass/poc-transactions.json
@@ -11,7 +11,7 @@
     {
       "minServerVersion": "4.1.8",
       "topologies": [
-        "sharded-replicaset"
+        "sharded"
       ]
     }
   ],
@@ -93,7 +93,7 @@
           "minServerVersion": "4.3.4",
           "topologies": [
             "replicaset",
-            "sharded-replicaset"
+            "sharded"
           ]
         }
       ],
@@ -203,7 +203,7 @@
           "minServerVersion": "4.3.4",
           "topologies": [
             "replicaset",
-            "sharded-replicaset"
+            "sharded"
           ]
         }
       ],
diff --git a/test/unified_format.py b/test/unified_format.py
index 93ef10090b..0a76f8c72e 100644
--- a/test/unified_format.py
+++ b/test/unified_format.py
@@ -814,84 +814,79 @@ def match_result(self, expectation, actual, in_recursive_call=False):
             self.test.assertEqual(expectation, actual)
             return None
 
-    def assertHasDatabaseName(self, spec, actual):
-        if "databaseName" in spec:
-            self.test.assertEqual(spec["databaseName"], actual.database_name)
-
-    def assertHasServiceId(self, spec, actual):
-        if "hasServiceId" in spec:
-            if spec.get("hasServiceId"):
-                self.test.assertIsNotNone(actual.service_id)
-                self.test.assertIsInstance(actual.service_id, ObjectId)
-            else:
-                self.test.assertIsNone(actual.service_id)
-
-    def assertHasInterruptInUseConnections(self, spec, actual):
-        if "interruptInUseConnections" in spec:
-            self.test.assertEqual(
-                spec.get("interruptInUseConnections"), actual.interrupt_connections
-            )
-        else:
-            self.test.assertIsInstance(actual.interrupt_connections, bool)
+    def match_server_description(self, actual: ServerDescription, spec: dict) -> None:
+        for field, expected in spec.items():
+            field = camel_to_snake(field)
+            if field == "type":
+                field = "server_type_name"
+            self.test.assertEqual(getattr(actual, field), expected)
+
+    def match_topology_description(self, actual: TopologyDescription, spec: dict) -> None:
+        for field, expected in spec.items():
+            field = camel_to_snake(field)
+            if field == "type":
+                field = "topology_type_name"
+            self.test.assertEqual(getattr(actual, field), expected)
+
+    def match_event_fields(self, actual: Any, spec: dict) -> None:
+        for field, expected in spec.items():
+            if field == "command" and isinstance(actual, CommandStartedEvent):
+                command = spec["command"]
+                if command:
+                    self.match_result(command, actual.command)
+                continue
+            if field == "reply" and isinstance(actual, CommandSucceededEvent):
+                reply = spec["reply"]
+                if reply:
+                    self.match_result(reply, actual.reply)
+                continue
+            if field == "hasServiceId":
+                if spec["hasServiceId"]:
+                    self.test.assertIsNotNone(actual.service_id)
+                    self.test.assertIsInstance(actual.service_id, ObjectId)
+                else:
+                    self.test.assertIsNone(actual.service_id)
+                continue
+            if field == "hasServerConnectionId":
+                if spec["hasServerConnectionId"]:
+                    self.test.assertIsNotNone(actual.server_connection_id)
+                    self.test.assertIsInstance(actual.server_connection_id, int)
+                else:
+                    self.test.assertIsNone(actual.server_connection_id)
+                continue
+            if field in ("previousDescription", "newDescription"):
+                if isinstance(actual, ServerDescriptionChangedEvent):
+                    self.match_server_description(
+                        getattr(actual, camel_to_snake(field)), spec[field]
+                    )
+                    continue
+                if isinstance(actual, TopologyDescriptionChangedEvent):
+                    self.match_topology_description(
+                        getattr(actual, camel_to_snake(field)), spec[field]
+                    )
+                    continue
 
-    def assertHasServerConnectionId(self, spec, actual):
-        if "hasServerConnectionId" in spec:
-            if spec.get("hasServerConnectionId"):
-                self.test.assertIsNotNone(actual.server_connection_id)
-                self.test.assertIsInstance(actual.server_connection_id, int)
+            if field == "interruptInUseConnections":
+                field = "interrupt_connections"
             else:
-                self.test.assertIsNone(actual.server_connection_id)
+                field = camel_to_snake(field)
+            self.test.assertEqual(getattr(actual, field), expected)
 
-    def match_server_description(self, actual: ServerDescription, spec: dict) -> None:
-        if "type" in spec:
-            self.test.assertEqual(actual.server_type_name, spec["type"])
-        if "error" in spec:
-            self.test.process_error(actual.error, spec["error"])
-        if "minWireVersion" in spec:
-            self.test.assertEqual(actual.min_wire_version, spec["minWireVersion"])
-        if "maxWireVersion" in spec:
-            self.test.assertEqual(actual.max_wire_version, spec["maxWireVersion"])
-        if "topologyVersion" in spec:
-            self.test.assertEqual(actual.topology_version, spec["topologyVersion"])
-
-    def match_event(self, event_type, expectation, actual):
+    def match_event(self, expectation, actual):
         name, spec = next(iter(expectation.items()))
-
-        # every command event has the commandName field
-        if event_type == "command":
-            command_name = spec.get("commandName")
-            if command_name:
-                self.test.assertEqual(command_name, actual.command_name)
-
         if name == "commandStartedEvent":
             self.test.assertIsInstance(actual, CommandStartedEvent)
-            command = spec.get("command")
-            if command:
-                self.match_result(command, actual.command)
-            self.assertHasDatabaseName(spec, actual)
-            self.assertHasServiceId(spec, actual)
-            self.assertHasServerConnectionId(spec, actual)
         elif name == "commandSucceededEvent":
             self.test.assertIsInstance(actual, CommandSucceededEvent)
-            reply = spec.get("reply")
-            if reply:
-                self.match_result(reply, actual.reply)
-            self.assertHasDatabaseName(spec, actual)
-            self.assertHasServiceId(spec, actual)
-            self.assertHasServerConnectionId(spec, actual)
         elif name == "commandFailedEvent":
             self.test.assertIsInstance(actual, CommandFailedEvent)
-            self.assertHasServiceId(spec, actual)
-            self.assertHasDatabaseName(spec, actual)
-            self.assertHasServerConnectionId(spec, actual)
         elif name == "poolCreatedEvent":
             self.test.assertIsInstance(actual, PoolCreatedEvent)
         elif name == "poolReadyEvent":
             self.test.assertIsInstance(actual, PoolReadyEvent)
         elif name == "poolClearedEvent":
             self.test.assertIsInstance(actual, PoolClearedEvent)
-            self.assertHasServiceId(spec, actual)
-            self.assertHasInterruptInUseConnections(spec, actual)
+            self.test.assertIsInstance(actual.interrupt_connections, bool)
         elif name == "poolClosedEvent":
             self.test.assertIsInstance(actual, PoolClosedEvent)
         elif name == "connectionCreatedEvent":
@@ -900,43 +895,29 @@ def match_event(self, event_type, expectation, actual):
             self.test.assertIsInstance(actual, ConnectionReadyEvent)
         elif name == "connectionClosedEvent":
             self.test.assertIsInstance(actual, ConnectionClosedEvent)
-            if "reason" in spec:
-                self.test.assertEqual(actual.reason, spec["reason"])
         elif name == "connectionCheckOutStartedEvent":
             self.test.assertIsInstance(actual, ConnectionCheckOutStartedEvent)
         elif name == "connectionCheckOutFailedEvent":
             self.test.assertIsInstance(actual, ConnectionCheckOutFailedEvent)
-            if "reason" in spec:
-                self.test.assertEqual(actual.reason, spec["reason"])
         elif name == "connectionCheckedOutEvent":
             self.test.assertIsInstance(actual, ConnectionCheckedOutEvent)
         elif name == "connectionCheckedInEvent":
             self.test.assertIsInstance(actual, ConnectionCheckedInEvent)
         elif name == "serverDescriptionChangedEvent":
             self.test.assertIsInstance(actual, ServerDescriptionChangedEvent)
-            if "previousDescription" in spec:
-                self.match_server_description(
-                    actual.previous_description, spec["previousDescription"]
-                )
-            if "newDescription" in spec:
-                self.match_server_description(actual.new_description, spec["newDescription"])
         elif name == "serverHeartbeatStartedEvent":
             self.test.assertIsInstance(actual, ServerHeartbeatStartedEvent)
-            if "awaited" in spec:
-                self.test.assertEqual(actual.awaited, spec["awaited"])
         elif name == "serverHeartbeatSucceededEvent":
             self.test.assertIsInstance(actual, ServerHeartbeatSucceededEvent)
-            if "awaited" in spec:
-                self.test.assertEqual(actual.awaited, spec["awaited"])
         elif name == "serverHeartbeatFailedEvent":
             self.test.assertIsInstance(actual, ServerHeartbeatFailedEvent)
-            if "awaited" in spec:
-                self.test.assertEqual(actual.awaited, spec["awaited"])
         elif name == "topologyDescriptionChangedEvent":
             self.test.assertIsInstance(actual, TopologyDescriptionChangedEvent)
         else:
             raise Exception(f"Unsupported event type {name}")
 
+        self.match_event_fields(actual, spec)
+
 
 def coerce_result(opname, result):
     """Convert a pymongo result into the spec's result format."""
@@ -972,7 +953,7 @@ class UnifiedSpecTestMixinV1(IntegrationTest):
     a class attribute ``TEST_SPEC``.
     """
 
-    SCHEMA_VERSION = Version.from_string("1.19")
+    SCHEMA_VERSION = Version.from_string("1.20")
     RUN_ON_LOAD_BALANCER = True
     RUN_ON_SERVERLESS = True
     TEST_SPEC: Any
@@ -1606,7 +1587,7 @@ def _event_count(self, client_name, event):
         count = 0
         for actual in actual_events:
             try:
-                self.match_evaluator.match_event("all", event, actual)
+                self.match_evaluator.match_event(event, actual)
             except AssertionError:
                 continue
             else:
@@ -1763,10 +1744,17 @@ def check_events(self, spec):
                 self.assertEqual(actual_events, [])
                 continue
 
-            self.assertEqual(len(actual_events), len(events), actual_events)
+            if len(actual_events) != len(events):
+                expected = "\n".join(str(e) for e in events)
+                actual = "\n".join(str(a) for a in actual_events)
+                self.assertEqual(
+                    len(actual_events),
+                    len(events),
+                    f"expected events:\n{expected}\nactual events:\n{actual}",
+                )
 
             for idx, expected_event in enumerate(events):
-                self.match_evaluator.match_event(event_type, expected_event, actual_events[idx])
+                self.match_evaluator.match_event(expected_event, actual_events[idx])
 
             if has_server_connection_id:
                 assert server_connection_id is not None