diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0f22a14..0bb24e3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,19 +7,23 @@ on:
       - ".github/**"
       - ".vscode/**"
       - "README.md"
-  workflow_dispatch:
 
 jobs:
   build:
     runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/cirruslabs/flutter:3.35.5
 
     steps:
       - name: Checkout OneSignal-Flutter-SDK
         uses: actions/checkout@v5
 
-      - name: Install Dependencies 🔗⛓📦
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version: 3.35.5
+          cache: true
+
+      - name: Install
         run: flutter pub get
 
       - name: Static Analysis
@@ -29,4 +33,4 @@ jobs:
         run: dart format --set-exit-if-changed --output=none .
 
       - name: Run Flutter unit tests
-        run: flutter test
+        run: dart run rps test
diff --git a/pubspec.yaml b/pubspec.yaml
index 5ac8318..f10a24b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,7 +4,7 @@ version: 5.3.4
 homepage: https://github.com/OneSignal/OneSignal-Flutter-SDK
 
 scripts:
-  test: dlcov -c 80 --lcov-gen="flutter test --coverage" --include-untested-files=true
+  test: flutter test --coverage && dart run dlcov -c 80 --log=0 --include-untested-files=true
 
 flutter:
   plugin:
@@ -27,5 +27,5 @@ dev_dependencies:
   rps: ^0.9.1
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=1.10.0"
+  sdk: ">=3.0.0 <4.0.0"
+  flutter: ">=3.0.0"
diff --git a/test/mock_channel.dart b/test/mock_channel.dart
index 8fdb6f6..2de7c47 100644
--- a/test/mock_channel.dart
+++ b/test/mock_channel.dart
@@ -125,10 +125,6 @@ class OneSignalMockChannelController {
       case "OneSignal#removeExternalUserId":
         state.externalId = null;
         return {"success": true};
-      case "OneSignal#setLanguage":
-        state.language =
-            (call.arguments as Map<dynamic, dynamic>)['language'] as String?;
-        return {"success": true};
       case "OneSignal#requestPermission":
         // Location requestPermission (no arguments)
         if (call.arguments == null) {
@@ -204,9 +200,6 @@ class OneSignalMockChannelController {
         break;
       case "OneSignal#arePaused":
         return state.inAppMessagesPaused ?? false;
-      case "OneSignal#lifecycleInit":
-        state.lifecycleInitCalled = true;
-        break;
       case "OneSignal#displayNotification":
         // This is called on OneSignal#notifications channel
         state.displayedNotificationId = (call.arguments