DRIVERS-2295 fix typos and add missing $$unsetOrMatches (#1836)

Co-authored-by: Steven Silvester <[email protected]>

Author: kevinAlbs

source/client-side-encryption/tests/unified/timeoutMS.json

@@ -122,7 +122,7 @@ tests:
         arguments:
           document: &doc0 { _id: 1, encrypted_string: "string0", random: "abc" }
         object: "coll"
-        expectResult:
+        expectError:
           isTimeoutError: true
     expectEvents:
       - client: "client0"
@@ -156,5 +156,5 @@ tests:
         arguments:
           document: *doc0
         object: "coll"
-        expectResult:
+        expectError:
           isTimeoutError: true

source/client-side-encryption/tests/unified/timeoutMS.yml

@@ -248,6 +248,8 @@ tests:
                 updates:
                   - q: {}
                     u: { $unset: { encrypted_string: "" } }
+                    multi: { "$$unsetOrMatches": false }
+                    upsert: { "$$unsetOrMatches": false }
                 ordered: true
               commandName: update
   - description: "$rename works if target value has same encryption options"
@@ -292,6 +294,8 @@ tests:
                 updates:
                   - q: {}
                     u: { $rename: { encrypted_string: "encrypted_string_equivalent" } }
+                    multi: { "$$unsetOrMatches": false }
+                    upsert: { "$$unsetOrMatches": false }
                 ordered: true
               commandName: update
   - description: "$rename fails if target value has different encryption options"

source/client-side-encryption/tests/unified/updateOne.json

@@ -160,7 +160,7 @@ tests:
       - name: runCommand
         object: "db"
         arguments:
-          commandName: collMod
+          commandName: createIndexes
           command:
             createIndexes: "encryptedCollection"
             indexes: