cleaning

Microsoft.Azure.Cosmos/src/Query/Core/Pipeline/Aggregate/Aggregators/MakeListAggregator.cs

@@ -22,10 +22,14 @@ internal sealed class MakeListAggregator : IAggregator
         private MakeListAggregator(CosmosArray initialList)
         {
             this.globalList = new List<CosmosElement>();
-            foreach (CosmosElement listItem in initialList)
+
+            // InitialList should never be null, but if it is we just keep global list as an empty list. 
+            if (initialList == null)
             {
-                this.globalList.Add(listItem);
+                return;
             }
+
+            this.globalList.AddRange(initialList.ToList<CosmosElement>());
         }
 
         public void Aggregate(CosmosElement localList)

Microsoft.Azure.Cosmos/src/Query/Core/Pipeline/Aggregate/Aggregators/MakeSetAggregator.cs

@@ -22,10 +22,14 @@ internal sealed class MakeSetAggregator : IAggregator
         private MakeSetAggregator(CosmosArray initialSet)
         {
             this.globalSet = new HashSet<CosmosElement>();
-            foreach (CosmosElement setItem in initialSet)
+
+            // InitialSet should never be null, but if it is we just keep globalSet as an empty set. 
+            if (initialSet == null)
             {
-                this.globalSet.Add(setItem);
+                return;
             }
+
+            this.globalSet.UnionWith(initialSet.ToList<CosmosElement>());
         }
 
         public void Aggregate(CosmosElement localSet)

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Query/AggregateQueryTests.cs

@@ -1115,12 +1115,13 @@ public async Task TestArrayAggregatesWithContinuationTokenAsync()
             await this.TestArrayAggregatesWithContinuationToken(100);
 
             // using 2048 + 1 documents here to ensure list size hits continuation token limit of 16KB
-            // We aggregates c.age (integers) which has 8 bytes, 16KB / 8B = 2048
+            // We aggregate c.age (integers) which has 8 bytes, 16KB / 8B = 2048
             await this.TestArrayAggregatesWithContinuationToken(2049);
         }
+
         private async Task TestArrayAggregatesWithContinuationToken(int numDocuments)
         {
-            int seed = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
+            int seed = 135749376;
 
             Random rand = new Random(seed);
             List<Person> people = new List<Person>();