diff --git a/test/auth/legacy/connection-string.json b/test/auth/legacy/connection-string.json
index 3a099c8137..8982b61d5a 100644
--- a/test/auth/legacy/connection-string.json
+++ b/test/auth/legacy/connection-string.json
@@ -440,6 +440,21 @@
         }
       }
     },
+    {
+      "description": "should throw an exception if username provided (MONGODB-AWS)",
+      "uri": "mongodb://user@localhost.com/?authMechanism=MONGODB-AWS",
+      "valid": false
+    },
+    {
+      "description": "should throw an exception if username and password provided (MONGODB-AWS)",
+      "uri": "mongodb://user:pass@localhost.com/?authMechanism=MONGODB-AWS",
+      "valid": false
+    },
+    {
+      "description": "should throw an exception if AWS_SESSION_TOKEN provided (MONGODB-AWS)",
+      "uri": "mongodb://localhost/?authMechanism=MONGODB-AWS&authMechanismProperties=AWS_SESSION_TOKEN:token",
+      "valid": false
+    },
     {
       "description": "should recognise the mechanism with test environment (MONGODB-OIDC)",
       "uri": "mongodb://localhost/?authMechanism=MONGODB-OIDC&authMechanismProperties=ENVIRONMENT:test",
diff --git a/test/client-side-encryption/etc/data/lookup/schema-non-csfle.json b/test/client-side-encryption/etc/data/lookup/schema-non-csfle.json
new file mode 100644
index 0000000000..3edd12c8f4
--- /dev/null
+++ b/test/client-side-encryption/etc/data/lookup/schema-non-csfle.json
@@ -0,0 +1,3 @@
+{
+   "bsonType": "object"
+}
diff --git a/test/client-side-encryption/spec/unified/fle2v2-CreateCollection.json b/test/client-side-encryption/spec/unified/fle2v2-CreateCollection.json
index 3dfb76c461..81a4c61731 100644
--- a/test/client-side-encryption/spec/unified/fle2v2-CreateCollection.json
+++ b/test/client-side-encryption/spec/unified/fle2v2-CreateCollection.json
@@ -554,7 +554,7 @@
         },
         {
           "name": "assertIndexNotExists",
-          "object": "db",
+          "object": "testRunner",
           "arguments": {
             "databaseName": "default",
             "collectionName": "encryptedCollection",
diff --git a/test/client-side-encryption/spec/unified/fle2v2-validatorAndPartialFieldExpression.json b/test/client-side-encryption/spec/unified/fle2v2-validatorAndPartialFieldExpression.json
index 54cc60a3b1..8d69464400 100644
--- a/test/client-side-encryption/spec/unified/fle2v2-validatorAndPartialFieldExpression.json
+++ b/test/client-side-encryption/spec/unified/fle2v2-validatorAndPartialFieldExpression.json
@@ -108,7 +108,7 @@
         },
         {
           "name": "assertCollectionExists",
-          "object": "coll",
+          "object": "testRunner",
           "arguments": {
             "databaseName": "default",
             "collectionName": "encryptedCollection"
@@ -248,7 +248,7 @@
         },
         {
           "name": "assertIndexExists",
-          "object": "coll",
+          "object": "testRunner",
           "arguments": {
             "databaseName": "default",
             "collectionName": "encryptedCollection",