ChangeStreams update tests for latest nightly

Author: rozza

driver-core/src/test/functional/com/mongodb/operation/AggregateOperationSpecification.groovy

@@ -178,7 +178,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification {
         given:
         def expected = [createExpectedChangeNotification(namespace, 0), createExpectedChangeNotification(namespace, 1)]
 
-        def pipeline = ['{$changeStream: {}}', '{$project: {"_id.clusterTime": 0}}'].collect { BsonDocument.parse(it) }
+        def pipeline = ['{$changeStream: {}}', '{$project: {"_id.clusterTime": 0, "_id.uuid": 0}}'].collect { BsonDocument.parse(it) }
         def operation = new AggregateOperation<BsonDocument>(namespace, pipeline, new BsonDocumentCodec())
 
         when:
@@ -194,7 +194,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification {
         cursor?.close()
 
         where:
-        async << [true]
+        async << [true, false]
     }
 
     def 'should be able to aggregate'() {
@@ -406,7 +406,6 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification {
     private static BsonDocument createExpectedChangeNotification(MongoNamespace namespace, int idValue) {
         BsonDocument.parse("""{
             "_id": {
-                "ns": "$namespace",
                 "documentKey": {"_id": $idValue}
             },
             "operationType": "insert",

driver-core/src/test/functional/com/mongodb/operation/ChangeStreamOperationSpecification.groovy

@@ -287,7 +287,6 @@ class ChangeStreamOperationSpecification extends OperationFunctionalSpecificatio
         docs.collect {
             BsonDocument.parse("""{
                 "_id": {
-                    "ns": "${helper.getNamespace()}",
                     "documentKey": {"_id": $it}
                 },
                 "operationType": "insert",
@@ -299,16 +298,17 @@ class ChangeStreamOperationSpecification extends OperationFunctionalSpecificatio
     }
 
     def tryNextAndClean(cursor, boolean async) {
-        removeTimestamp(tryNext(cursor, async))
+        removeTimestampAndUUID(tryNext(cursor, async))
     }
 
     def nextAndClean(cursor, boolean async) {
-        removeTimestamp(next(cursor, async))
+        removeTimestampAndUUID(next(cursor, async))
     }
 
-    def removeTimestamp(List<BsonDocument> next) {
+    def removeTimestampAndUUID(List<BsonDocument> next) {
         next?.collect { doc ->
             doc.getDocument('_id').remove('clusterTime')
+            doc.getDocument('_id').remove('uuid')
             doc
         }
     }