diff --git a/.github/workflows/functions.yml b/.github/workflows/functions.yml
index a51d5835c16..8e0fa1923be 100644
--- a/.github/workflows/functions.yml
+++ b/.github/workflows/functions.yml
@@ -44,11 +44,12 @@ jobs:
       run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
     - name: Setup Bundler
       run: scripts/setup_bundler.sh
-    - name: Integration Test Server
-      run: FirebaseFunctions/Backend/start.sh synchronous
+    # The integration tests are flaky on Xcode 15 so only run the unit tests. The integration tests still run with SPM.
+    # - name: Integration Test Server
+    #   run: FirebaseFunctions/Backend/start.sh synchronous
     - name: Build and test
       run: |
-        scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseFunctions.podspec --platforms=${{ matrix.target }}
+        scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseFunctions.podspec  --test-specs=unit --platforms=${{ matrix.target }}
 
   spm-integration:
     # Don't run on private repo unless it is a PR.
diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
index bcc7692650d..dc12dc0ab7c 100644
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -142,7 +142,7 @@ jobs:
     - name: Initialize xcodebuild
       run: scripts/setup_spm_tests.sh
     - name: Unit Tests
-      run: scripts/third_party/travis/retry.sh ./scripts/build.sh PerformanceUnit ${{ matrix.target }} spm --platforms=${{ matrix.target }}
+      run: scripts/third_party/travis/retry.sh ./scripts/build.sh PerformanceUnit ${{ matrix.target }} spm
 
   catalyst:
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
diff --git a/.github/workflows/spm.yml b/.github/workflows/spm.yml
index 1a1e1440596..0ef8a17158e 100644
--- a/.github/workflows/spm.yml
+++ b/.github/workflows/spm.yml
@@ -31,8 +31,11 @@ jobs:
         include:
           - os: macos-12
             xcode: Xcode_14.2
+            test: spm
+          # The integration tests are slow and flaky on Xcode 15, so just build.
           - os: macos-13
             xcode: Xcode_15.0.1
+            test: spmbuildonly
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -46,7 +49,7 @@ jobs:
     - name: Functions Integration Test Server
       run: FirebaseFunctions/Backend/start.sh synchronous
     - name: iOS Unit Tests
-      run: scripts/third_party/travis/retry.sh ./scripts/build.sh Firebase-Package iOS spm
+      run: scripts/third_party/travis/retry.sh ./scripts/build.sh Firebase-Package iOS ${{ matrix.test }}
 
   # Test iOS Device build since some Firestore dependencies build different files.
   iOS-Device:
diff --git a/FirebaseInAppMessaging/Sources/Data/FIRIAMMessageContentDataWithImageURL.m b/FirebaseInAppMessaging/Sources/Data/FIRIAMMessageContentDataWithImageURL.m
index 081dc6fc1be..60b0b78bbcc 100644
--- a/FirebaseInAppMessaging/Sources/Data/FIRIAMMessageContentDataWithImageURL.m
+++ b/FirebaseInAppMessaging/Sources/Data/FIRIAMMessageContentDataWithImageURL.m
@@ -40,7 +40,7 @@ @interface FIRIAMMessageContentDataWithImageURL ()
 
 @implementation FIRIAMMessageContentDataWithImageURL
 - (instancetype)initWithMessageTitle:(nullable NSString *)title
-                         messageBody:(NSString *)body
+                         messageBody:(nullable NSString *)body
                     actionButtonText:(nullable NSString *)actionButtonText
            secondaryActionButtonText:(nullable NSString *)secondaryActionButtonText
                            actionURL:(nullable NSURL *)actionURL
diff --git a/FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageContentDataWithImageURL.h b/FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageContentDataWithImageURL.h
index c6eb289e9be..5e13a42b873 100644
--- a/FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageContentDataWithImageURL.h
+++ b/FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageContentDataWithImageURL.h
@@ -38,7 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
  *                   it's easier for doing mocking with unit testing.
  */
 - (instancetype)initWithMessageTitle:(nullable NSString *)title
-                         messageBody:(NSString *)body
+                         messageBody:(nullable NSString *)body
                     actionButtonText:(nullable NSString *)actionButtonText
            secondaryActionButtonText:(nullable NSString *)secondaryActionButtonText
                            actionURL:(nullable NSURL *)actionURL