diff --git a/Firestore/Swift/Tests/Integration/PipelineTests.swift b/Firestore/Swift/Tests/Integration/PipelineTests.swift
index 886c4a949ad..48ed0934496 100644
--- a/Firestore/Swift/Tests/Integration/PipelineTests.swift
+++ b/Firestore/Swift/Tests/Integration/PipelineTests.swift
@@ -1616,7 +1616,7 @@ class PipelineIntegrationTests: FSTIntegrationTestCase {
       .collection(collRef.path)
       .select([
         Field("title"),
-        Field("published").logicalMaximum([Constant(1960), 1961]).as("published-safe"),
+        Field("published").logicalMaximum([Constant(1960), 1961]).as("publishedSafe"),
       ])
       .sort([Field("title").ascending()])
       .limit(3)
@@ -1624,9 +1624,9 @@ class PipelineIntegrationTests: FSTIntegrationTestCase {
     let snapshot = try await pipeline.execute()
 
     let expectedResults: [[String: Sendable]] = [
-      ["title": "1984", "published-safe": 1961],
-      ["title": "Crime and Punishment", "published-safe": 1961],
-      ["title": "Dune", "published-safe": 1965],
+      ["title": "1984", "publishedSafe": 1961],
+      ["title": "Crime and Punishment", "publishedSafe": 1961],
+      ["title": "Dune", "publishedSafe": 1965],
     ]
 
     TestHelper.compare(snapshot: snapshot, expected: expectedResults, enforceOrder: true)
@@ -1640,7 +1640,7 @@ class PipelineIntegrationTests: FSTIntegrationTestCase {
       .collection(collRef.path)
       .select([
         Field("title"),
-        Field("published").logicalMinimum([Constant(1960), 1961]).as("published-safe"),
+        Field("published").logicalMinimum([Constant(1960), 1961]).as("publishedSafe"),
       ])
       .sort([Field("title").ascending()])
       .limit(3)
@@ -1648,9 +1648,9 @@ class PipelineIntegrationTests: FSTIntegrationTestCase {
     let snapshot = try await pipeline.execute()
 
     let expectedResults: [[String: Sendable]] = [
-      ["title": "1984", "published-safe": 1949],
-      ["title": "Crime and Punishment", "published-safe": 1866],
-      ["title": "Dune", "published-safe": 1960],
+      ["title": "1984", "publishedSafe": 1949],
+      ["title": "Crime and Punishment", "publishedSafe": 1866],
+      ["title": "Dune", "publishedSafe": 1960],
     ]
 
     TestHelper.compare(snapshot: snapshot, expected: expectedResults, enforceOrder: true)
@@ -1665,7 +1665,7 @@ class PipelineIntegrationTests: FSTIntegrationTestCase {
       .select([
         Field("title"),
         Field("published").lessThan(1960).then(Constant(1960), else: Field("published"))
-          .as("published-safe"),
+          .as("publishedSafe"),
       ])
       .sort([Field("title").ascending()])
       .limit(3)
@@ -1673,9 +1673,9 @@ class PipelineIntegrationTests: FSTIntegrationTestCase {
     let snapshot = try await pipeline.execute()
 
     let expectedResults: [[String: Sendable]] = [
-      ["title": "1984", "published-safe": 1960],
-      ["title": "Crime and Punishment", "published-safe": 1960],
-      ["title": "Dune", "published-safe": 1965],
+      ["title": "1984", "publishedSafe": 1960],
+      ["title": "Crime and Punishment", "publishedSafe": 1960],
+      ["title": "Dune", "publishedSafe": 1965],
     ]
 
     TestHelper.compare(snapshot: snapshot, expected: expectedResults, enforceOrder: true)
@@ -2755,8 +2755,8 @@ class PipelineIntegrationTests: FSTIntegrationTestCase {
     let snapshot = try await pipeline.execute()
 
     let expectedResults: [[String: Sendable?]] = [
-      ["title": "The Hitchhiker's Guide to the Galaxy", "awards.hugo": true],
-      ["title": "Dune", "awards.hugo": true],
+      ["title": "The Hitchhiker's Guide to the Galaxy", "awards": ["hugo": true]],
+      ["title": "Dune", "awards": ["hugo": true]],
     ]
 
     TestHelper.compare(snapshot: snapshot, expected: expectedResults, enforceOrder: true)
@@ -2783,10 +2783,13 @@ class PipelineIntegrationTests: FSTIntegrationTestCase {
     let expectedResultsArray: [[String: Sendable?]] = [
       [
         "title": "The Hitchhiker's Guide to the Galaxy",
+        "nestedField": ["level": [String: Any]()],
         "nested": true,
       ],
       [
         "title": "Dune",
+        "nestedField": ["level": [String: Any]()],
+        "nested": nil,
       ],
     ]
     TestHelper.compare(