diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7bbe73e60..6267cb422 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,19 +48,13 @@ jobs:
             name: "macOS 12, Xcode 14.1, Swift 5.7.1"
     steps:
       - uses: actions/checkout@v3
-      # - name: Install Dependencies
-      #   run: make setup_build_tools
-      # - name: Generate project
-      #   run: make generate
-      - name: ${{ matrix.name }}
-        run: swift build -v
-        # run: xcodebuild test CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -scheme "Flare" -destination "platform=macOS" clean -enableCodeCoverage YES -resultBundlePath "./macos.xcresult" || exit 1
-      # - name: Upload coverage reports to Codecov
-      #   uses: codecov/codecov-action@v3.1.0
-      #   with:
-      #     token: ${{ secrets.CODECOV_TOKEN }}
-      #     xcode: true
-      #     xcode_archive_path: "./macos.xcresult"
+        run: xcodebuild test -scheme "Flare" -destination "platform=macOS" clean -enableCodeCoverage YES -resultBundlePath "./macos.xcresult" || exit 1
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v3.1.0
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          xcode: true
+          xcode_archive_path: "./macos.xcresult"
 
   iOS:
     name: ${{ matrix.name }}
@@ -80,10 +74,6 @@ jobs:
             name: "iOS 16.4"
             xcode: "Xcode_14.3.1"
             runsOn: macos-13
-          # - destination: "OS=15.5,name=iPhone 13 Pro"
-          #   name: "iOS 15.5"
-          #   xcode: "Xcode_13.4.1"
-          #   runsOn: macOS-12
     steps:
       - uses: actions/checkout@v3
       - name: Install Dependencies
@@ -91,7 +81,7 @@ jobs:
       - name: Generate project
         run: make generate
       - name: ${{ matrix.name }}
-        run: xcodebuild test -scheme "Flare" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES -resultBundlePath "./iphonesimulator.xcresult" || exit 1
+        run: xcodebuild test -scheme "Flare" -destination "${{ matrix.destination }}" -testPlan AllTests clean -enableCodeCoverage YES -resultBundlePath "./iphonesimulator.xcresult" || exit 1
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v3.1.0
         with:
@@ -117,10 +107,6 @@ jobs:
             name: "tvOS 16.4"
             xcode: "Xcode_14.3.1"
             runsOn: macos-13
-          # - destination: "OS=15.4,name=Apple TV"
-          #   name: "tvOS 15.4"
-          #   xcode: "Xcode_13.4.1"
-          #   runsOn: macos-12
     steps:
       - uses: actions/checkout@v3
       - name: Install Dependencies
@@ -128,7 +114,7 @@ jobs:
       - name: Generate project
         run: make generate
       - name: ${{ matrix.name }}
-        run: xcodebuild test -scheme "Flare" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES -resultBundlePath "./appletvsimulator.xcresult" || exit 1
+        run: xcodebuild test -scheme "Flare" -destination "${{ matrix.destination }}" -testPlan AllTests clean -enableCodeCoverage YES -resultBundlePath "./appletvsimulator.xcresult" || exit 1
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v3.1.0
         with:
@@ -136,6 +122,64 @@ jobs:
           xcode: true
           xcode_archive_path: "./appletvsimulator.xcresult"
 
+  watchOS:
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.runsOn }}
+    env:
+      DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}.app/Contents/Developer"
+    timeout-minutes: 20
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - destination: "OS=10.0,name=Apple Watch Series 9 (45mm)"
+            name: "watchOS 10.0"
+            xcode: "Xcode_15.0"
+            runsOn: macos-13
+          - destination: "OS=9.4,name=Apple Watch Series 8 (45mm)"
+            name: "watchOS 9.4"
+            xcode: "Xcode_14.3.1"
+            runsOn: macos-13
+          - destination: "OS=8.5,name=Apple Watch Series 7 (45mm)"
+            name: "watchOS 8.5"
+            xcode: "Xcode_14.3.1"
+            runsOn: macos-13
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Dependencies
+        run: make setup_build_tools
+      - name: Generate project
+        run: make generate
+      - name: ${{ matrix.name }}
+        run: xcodebuild test -scheme "Flare" -destination "${{ matrix.destination }}" -testPlan UnitTests clean -enableCodeCoverage YES -resultBundlePath "./watchsimulator.xcresult" || exit 1
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v3.1.0
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          xcode: true
+          xcode_archive_path: "./watchsimulator.xcresult"
+
+  spm:
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.runsOn }}
+    env:
+      DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}.app/Contents/Developer"
+    timeout-minutes: 20
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: "Xcode 15"
+            xcode: "Xcode_15.0"
+            runsOn: macos-13
+          - name: "Xcode 14"
+            xcode: "Xcode_14.3.1"
+            runsOn: macos-13
+    steps:
+      - uses: actions/checkout@v3
+      - name: ${{ matrix.name }}
+        run: swift build -c release --target Flare
+
   # Beta:
   #   name: ${{ matrix.name }}
   #   runs-on: firebreak