diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 21caada18..95e75f8d0 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -9,9 +9,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: '11'
         distribution: 'adopt'
@@ -23,14 +23,14 @@ jobs:
     - name: Run with Gradle
       uses: gradle/gradle-build-action@v2
       with:
-        arguments: assembleProdDebug -PdisablePreDex
+        arguments: assembleProdDebug -PdisablePreDex --scan
 
   unit-test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: '11'
         distribution: 'adopt'
@@ -42,7 +42,7 @@ jobs:
     - name: Run with Gradle
       uses: gradle/gradle-build-action@v2
       with:
-        arguments: testProdDebugUnitTest
+        arguments: testProdDebugUnitTest --scan
 
 #  ui-test:
 #    runs-on: macos-latest
@@ -73,9 +73,9 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: '11'
         distribution: 'adopt'
@@ -87,14 +87,14 @@ jobs:
     - name: Run with Gradle
       uses: gradle/gradle-build-action@v2
       with:
-        arguments: ktlintCheck
+        arguments: ktlintCheck --scan
 
   detekt:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: '11'
         distribution: 'adopt'
@@ -106,9 +106,9 @@ jobs:
     - name: Run with Gradle
       uses: gradle/gradle-build-action@v2
       with:
-        arguments: detekt
+        arguments: detekt --scan
     - name: Upload SARIF to Github using the upload-sarif action
-      uses: github/codeql-action/upload-sarif@v1
+      uses: github/codeql-action/upload-sarif@v2
       if: ${{ always() }}
       with:
         sarif_file: build/reports/detekt.sarif
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 8e2325631..c11905213 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -290,19 +290,6 @@ android {
 android.testOptions {
     unitTests.all {
         useJUnitPlatform()
-        testLogging {
-            events "passed", "skipped", "failed", "standardError"
-            outputs.upToDateWhen {false}
-
-            afterSuite { desc, result ->
-                if (!desc.parent) { // will match the outermost suite
-                    def output = "Results: ${result.resultType} (${result.testCount} tests, ${result.successfulTestCount} passed, ${result.failedTestCount} failed, ${result.skippedTestCount} skipped)"
-                    def startItem = '|  ', endItem = '  |'
-                    def repeatLength = startItem.length() + output.length() + endItem.length()
-                    println('\n' + ('-' * repeatLength) + '\n' + startItem + output + endItem + '\n' + ('-' * repeatLength))
-                }
-            }
-        }
     }
     unitTests.returnDefaultValues = true
 }
diff --git a/build.gradle b/build.gradle
index 5c9ff0dac..a72bb46a5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,6 +62,22 @@ allprojects {
         google()
         mavenCentral()
     }
+
+    tasks.withType(Test) {
+        testLogging {
+            events "passed", "skipped", "failed", "standardError"
+            outputs.upToDateWhen {false}
+
+            afterSuite { desc, result ->
+                if (!desc.parent) { // will match the outermost suite
+                    def output = "Results: ${result.resultType} (${result.testCount} tests, ${result.successfulTestCount} passed, ${result.failedTestCount} failed, ${result.skippedTestCount} skipped)"
+                    def startItem = '|  ', endItem = '  |'
+                    def repeatLength = startItem.length() + output.length() + endItem.length()
+                    println('\n' + ('-' * repeatLength) + '\n' + startItem + output + endItem + '\n' + ('-' * repeatLength))
+                }
+            }
+        }
+    }
 }
 
 Properties props = new Properties()
@@ -110,4 +126,8 @@ tasks.named("detekt").configure {
         sarif.required.set(true)
         sarif.outputLocation.set(file("build/reports/detekt.sarif"))
     }
+}
+
+task allUnitTests(type: GradleBuild) {
+    tasks = [':Habitica:testProdDebugUnitTest', ':wearos:testProdDebugUnitTest', ':common:testProdDebugUnitTest', ':shared:testDebugUnitTest']
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 0371fd4b5..87b4e6ccc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,4 +5,5 @@ org.gradle.configureondemand=true
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xmx6656M
 org.gradle.warning.mode=all
-kotlin.mpp.stability.nowarn=true
\ No newline at end of file
+kotlin.mpp.stability.nowarn=true
+kotlin.mpp.androidSourceSetLayoutVersion=2
\ No newline at end of file
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
index 1ed4f9b3c..8d964619a 100644
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -29,7 +29,7 @@ kotlin {
             }
         }
         val androidMain by getting
-        val androidTest by getting
+        val androidUnitTest by getting
         val iosMain by getting
         val iosTest by getting
     }