diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 24d6e741de..cb7502e773 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,7 +1,6 @@
 import java.io.ByteArrayOutputStream
 import java.text.SimpleDateFormat
 import java.util.Date
-import kotlin.io.println
 
 plugins {
     id("com.android.application")
@@ -13,8 +12,6 @@ plugins {
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
-apply(from = "${project.rootDir}/core/main/test_dependencies.gradle")
-
 
 repositories {
     mavenCentral()
diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt
index 20cd87da5b..cff5e2d34f 100644
--- a/buildSrc/src/main/kotlin/Libs.kt
+++ b/buildSrc/src/main/kotlin/Libs.kt
@@ -42,6 +42,7 @@ object Libs {
         const val lifecycleViewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
         const val fragment = "androidx.fragment:fragment-ktx:1.6.1"
         const val navigationFragment = "androidx.navigation:navigation-fragment-ktx:2.7.4"
+        const val legacySupport = "androidx.legacy:legacy-support-v13:1.0.0"
 
         object Work {
 
diff --git a/buildSrc/src/main/kotlin/android-app-dependencies.gradle.kts b/buildSrc/src/main/kotlin/android-app-dependencies.gradle.kts
index 2229c8d87e..a134c05e76 100644
--- a/buildSrc/src/main/kotlin/android-app-dependencies.gradle.kts
+++ b/buildSrc/src/main/kotlin/android-app-dependencies.gradle.kts
@@ -22,6 +22,10 @@ android {
             isMinifyEnabled = false
             setProguardFiles(listOf(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"))
         }
+        named("debug") {
+            enableUnitTestCoverage = true
+            enableAndroidTestCoverage = true
+        }
     }
 
     compileOptions {
diff --git a/buildSrc/src/main/kotlin/android-module-dependencies.gradle.kts b/buildSrc/src/main/kotlin/android-module-dependencies.gradle.kts
index 4e6f9b7a76..c95e263536 100644
--- a/buildSrc/src/main/kotlin/android-module-dependencies.gradle.kts
+++ b/buildSrc/src/main/kotlin/android-module-dependencies.gradle.kts
@@ -6,9 +6,9 @@ plugins {
 android {
     compileSdk = Versions.compileSdk
     defaultConfig {
-        minSdk = 28
+        minSdk = Versions.minSdk
         @Suppress("DEPRECATION")
-        targetSdk = 28
+        targetSdk = Versions.targetSdk
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -18,6 +18,10 @@ android {
             isMinifyEnabled = false
             setProguardFiles(listOf(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"))
         }
+        named("debug") {
+            enableUnitTestCoverage = true
+            enableAndroidTestCoverage = true
+        }
     }
 
     sourceSets {
diff --git a/buildSrc/src/main/kotlin/test-app-dependencies.gradle.kts b/buildSrc/src/main/kotlin/test-app-dependencies.gradle.kts
new file mode 100644
index 0000000000..87209655de
--- /dev/null
+++ b/buildSrc/src/main/kotlin/test-app-dependencies.gradle.kts
@@ -0,0 +1,53 @@
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.gradle.api.tasks.testing.logging.TestLogEvent
+
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+}
+
+dependencies {
+    testImplementation(Libs.Kotlin.test)
+    testImplementation(Libs.JUnit.jupiter)
+    testImplementation(Libs.JUnit.jupiterApi)
+    testImplementation(Libs.json)
+    testImplementation(Libs.Mockito.jupiter)
+    testImplementation(Libs.Mockito.kotlin)
+    testImplementation(Libs.jodaTime)
+    testImplementation(Libs.Google.truth)
+    testImplementation(Libs.jsonAssert)
+
+    androidTestImplementation(Libs.AndroidX.Test.espressoCore)
+    androidTestImplementation(Libs.AndroidX.Test.extKtx)
+    androidTestImplementation(Libs.AndroidX.Test.rules)
+    //androidTestImplementation(Libs.AndroidX.Test.uiAutomator)
+}
+
+tasks.withType<Test> {
+    // use to display stdout in travis
+    testLogging {
+        // set options for log level LIFECYCLE
+        events = setOf(
+            TestLogEvent.FAILED,
+            TestLogEvent.STARTED,
+            TestLogEvent.SKIPPED,
+            TestLogEvent.STANDARD_OUT
+        )
+        exceptionFormat = TestExceptionFormat.FULL
+        useJUnitPlatform()
+    }
+}
+
+tasks.withType<Test>().configureEach {
+    maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).coerceAtLeast(1)
+    forkEvery = 20
+}
+
+android {
+    testOptions {
+        unitTests {
+            isReturnDefaultValues = true
+            isIncludeAndroidResources = true
+        }
+    }
+}
diff --git a/buildSrc/src/main/kotlin/test-dependencies.gradle.kts b/buildSrc/src/main/kotlin/test-module-dependencies.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/test-dependencies.gradle.kts
rename to buildSrc/src/main/kotlin/test-module-dependencies.gradle.kts
diff --git a/core/interfaces/build.gradle.kts b/core/interfaces/build.gradle.kts
index 31c56ff239..6454e6befb 100644
--- a/core/interfaces/build.gradle.kts
+++ b/core/interfaces/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     id("kotlin-parcelize")
     id("kotlinx-serialization")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/core/main/build.gradle.kts b/core/main/build.gradle.kts
index 34b07c21e5..48aef57a52 100644
--- a/core/main/build.gradle.kts
+++ b/core/main/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     id("kotlin-parcelize")
     id("android-module-dependencies")
     id("all-open-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/core/main/jacoco_global.gradle b/core/main/jacoco_global.gradle
index 3863fd0102..bad27e4fe7 100644
--- a/core/main/jacoco_global.gradle
+++ b/core/main/jacoco_global.gradle
@@ -93,10 +93,3 @@ def setupAndroidReporting() {
     }
 }
 
-android {
-    buildTypes {
-        debug {
-            testCoverageEnabled true
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/main/test_dependencies.gradle b/core/main/test_dependencies.gradle
deleted file mode 100644
index 800cb42b2e..0000000000
--- a/core/main/test_dependencies.gradle
+++ /dev/null
@@ -1,40 +0,0 @@
-dependencies {
-    //testImplementation "junit:junit:$junit_version"
-    testImplementation 'org.jetbrains.kotlin:kotlin-test:1.9.10'
-    testImplementation "org.junit.jupiter:junit-jupiter:$junit_jupiter_version"
-    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_jupiter_version"
-    testImplementation "org.json:json:$json_version"
-    testImplementation "org.mockito:mockito-junit-jupiter:$mockito_version"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:4.1.0"
-    testImplementation "joda-time:joda-time:$jodatime_version"
-    testImplementation 'com.google.truth:truth:1.1.5'
-    testImplementation "org.skyscreamer:jsonassert:1.5.0"
-
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation "androidx.test.ext:junit-ktx:$androidx_junit_version"
-    androidTestImplementation "androidx.test:rules:$androidx_rules_version"
-
-    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
-}
-
-tasks.matching { it instanceof Test }.all {
-    //testLogging.events = ["failed", "skipped", "started"]
-    // use to display stdout in travis
-    testLogging.events = ["failed", "skipped", "started", "standard_out"]
-    testLogging.exceptionFormat = "full"
-    useJUnitPlatform()
-}
-
-android {
-    testOptions {
-        unitTests {
-            returnDefaultValues = true
-            includeAndroidResources = true
-
-            all {
-                maxParallelForks = 10
-                forkEvery = 20
-            }
-        }
-    }
-}
diff --git a/core/nssdk/build.gradle.kts b/core/nssdk/build.gradle.kts
index 45b53a5da8..b166503a10 100644
--- a/core/nssdk/build.gradle.kts
+++ b/core/nssdk/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlinx-serialization")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 android {
diff --git a/core/utils/build.gradle.kts b/core/utils/build.gradle.kts
index b6d17b87dc..71d7d96f7c 100644
--- a/core/utils/build.gradle.kts
+++ b/core/utils/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     id("kotlin-allopen")
     id("android-module-dependencies")
     id("all-open-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/core/validators/build.gradle.kts b/core/validators/build.gradle.kts
index a9d7b72177..a0bbdfeb45 100644
--- a/core/validators/build.gradle.kts
+++ b/core/validators/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/database/entities/build.gradle.kts b/database/entities/build.gradle.kts
index d2bb87a15b..db37ef8927 100644
--- a/database/entities/build.gradle.kts
+++ b/database/entities/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 android {
diff --git a/database/impl/build.gradle.kts b/database/impl/build.gradle.kts
index 8186202d78..297ece9cc4 100644
--- a/database/impl/build.gradle.kts
+++ b/database/impl/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     id("kotlin-kapt")
     id("kotlin-allopen")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/implementation/build.gradle.kts b/implementation/build.gradle.kts
index 83062288a5..c68a3211cd 100644
--- a/implementation/build.gradle.kts
+++ b/implementation/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     id("kotlin-kapt")
     id("android-module-dependencies")
     id("all-open-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/insight/build.gradle.kts b/insight/build.gradle.kts
index f611ef6082..b62eae7095 100644
--- a/insight/build.gradle.kts
+++ b/insight/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/plugins/aps/build.gradle.kts b/plugins/aps/build.gradle.kts
index 4c9d8fa02c..1bad435573 100644
--- a/plugins/aps/build.gradle.kts
+++ b/plugins/aps/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/plugins/automation/build.gradle.kts b/plugins/automation/build.gradle.kts
index e58073ddfe..6c5615cfe5 100644
--- a/plugins/automation/build.gradle.kts
+++ b/plugins/automation/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/plugins/configuration/build.gradle.kts b/plugins/configuration/build.gradle.kts
index e9d67916f8..ffa40d3556 100644
--- a/plugins/configuration/build.gradle.kts
+++ b/plugins/configuration/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     id("kotlin-kapt")
     id("kotlin-parcelize")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/plugins/constraints/build.gradle.kts b/plugins/constraints/build.gradle.kts
index dce49e2eb0..cdaa7fdc04 100644
--- a/plugins/constraints/build.gradle.kts
+++ b/plugins/constraints/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
     id("all-open-dependencies")
 }
 
diff --git a/plugins/insulin/build.gradle.kts b/plugins/insulin/build.gradle.kts
index 961a2b22c5..56bd432a5a 100644
--- a/plugins/insulin/build.gradle.kts
+++ b/plugins/insulin/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/plugins/main/build.gradle.kts b/plugins/main/build.gradle.kts
index 078f015b96..b7a2184282 100644
--- a/plugins/main/build.gradle.kts
+++ b/plugins/main/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/plugins/sensitivity/build.gradle.kts b/plugins/sensitivity/build.gradle.kts
index b853e4ee2f..8d97c7db2f 100644
--- a/plugins/sensitivity/build.gradle.kts
+++ b/plugins/sensitivity/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/plugins/smoothing/build.gradle.kts b/plugins/smoothing/build.gradle.kts
index 830fe628af..9d612710a5 100644
--- a/plugins/smoothing/build.gradle.kts
+++ b/plugins/smoothing/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/plugins/source/build.gradle.kts b/plugins/source/build.gradle.kts
index 6fdf1fce31..244cdb7b47 100644
--- a/plugins/source/build.gradle.kts
+++ b/plugins/source/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/plugins/sync/build.gradle.kts b/plugins/sync/build.gradle.kts
index 37249f8397..5db40cd140 100644
--- a/plugins/sync/build.gradle.kts
+++ b/plugins/sync/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/pump/combo/build.gradle.kts b/pump/combo/build.gradle.kts
index 95adcc9f27..aceaa5418b 100644
--- a/pump/combo/build.gradle.kts
+++ b/pump/combo/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/pump/combov2/build.gradle.kts b/pump/combov2/build.gradle.kts
index 8dc33ec5e1..3e3d7ed73e 100644
--- a/pump/combov2/build.gradle.kts
+++ b/pump/combov2/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/pump/combov2/comboctl/build.gradle.kts b/pump/combov2/comboctl/build.gradle.kts
index c26cf210ed..545ce3fdf2 100644
--- a/pump/combov2/comboctl/build.gradle.kts
+++ b/pump/combov2/comboctl/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     id("com.android.library")
     id("kotlin-android")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/pump/dana/build.gradle.kts b/pump/dana/build.gradle.kts
index b30ba3fcec..3f223198cd 100644
--- a/pump/dana/build.gradle.kts
+++ b/pump/dana/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/pump/danar/build.gradle.kts b/pump/danar/build.gradle.kts
index 1bc5d9dbc5..fb0644393e 100644
--- a/pump/danar/build.gradle.kts
+++ b/pump/danar/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/pump/danars/build.gradle.kts b/pump/danars/build.gradle.kts
index 360b7b6036..f76b29187c 100644
--- a/pump/danars/build.gradle.kts
+++ b/pump/danars/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/pump/diaconn/build.gradle.kts b/pump/diaconn/build.gradle.kts
index 396afb8e30..b05c29cfa2 100644
--- a/pump/diaconn/build.gradle.kts
+++ b/pump/diaconn/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/pump/eopatch/build.gradle.kts b/pump/eopatch/build.gradle.kts
index 159d00f8d1..b8317c64d7 100644
--- a/pump/eopatch/build.gradle.kts
+++ b/pump/eopatch/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/pump/medtronic/build.gradle.kts b/pump/medtronic/build.gradle.kts
index 11c5ba4c10..c17f1a63d6 100644
--- a/pump/medtronic/build.gradle.kts
+++ b/pump/medtronic/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
@@ -24,7 +24,7 @@ dependencies {
 
     testImplementation(project(":shared:tests"))
     testImplementation(project(":database:impl"))
-    
+
     kapt(Libs.Dagger.compiler)
     kapt(Libs.Dagger.androidProcessor)
 }
diff --git a/pump/medtrum/build.gradle.kts b/pump/medtrum/build.gradle.kts
index c55212ca05..242c15cd71 100644
--- a/pump/medtrum/build.gradle.kts
+++ b/pump/medtrum/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/pump/omnipod-common/build.gradle.kts b/pump/omnipod-common/build.gradle.kts
index b08a13e331..d1aa2127a4 100644
--- a/pump/omnipod-common/build.gradle.kts
+++ b/pump/omnipod-common/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/pump/omnipod-dash/build.gradle.kts b/pump/omnipod-dash/build.gradle.kts
index 4b68eb3abf..5af1097055 100644
--- a/pump/omnipod-dash/build.gradle.kts
+++ b/pump/omnipod-dash/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/pump/omnipod-eros/build.gradle.kts b/pump/omnipod-eros/build.gradle.kts
index 1ebe77cd39..3e72a54c88 100644
--- a/pump/omnipod-eros/build.gradle.kts
+++ b/pump/omnipod-eros/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/pump/pump-common/build.gradle.kts b/pump/pump-common/build.gradle.kts
index 284ce51fa2..601102d151 100644
--- a/pump/pump-common/build.gradle.kts
+++ b/pump/pump-common/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/pump/rileylink/build.gradle.kts b/pump/rileylink/build.gradle.kts
index 0305f4c1e4..3682f1c5b4 100644
--- a/pump/rileylink/build.gradle.kts
+++ b/pump/rileylink/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/pump/virtual/build.gradle.kts b/pump/virtual/build.gradle.kts
index 9f3855284f..e2350981c1 100644
--- a/pump/virtual/build.gradle.kts
+++ b/pump/virtual/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/shared/impl/build.gradle.kts b/shared/impl/build.gradle.kts
index 999428294e..25056e51bf 100644
--- a/shared/impl/build.gradle.kts
+++ b/shared/impl/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts
index f368bab011..759741ad6f 100644
--- a/ui/build.gradle.kts
+++ b/ui/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
diff --git a/wear/build.gradle b/wear/build.gradle
deleted file mode 100644
index 11c4ddad0f..0000000000
--- a/wear/build.gradle
+++ /dev/null
@@ -1,174 +0,0 @@
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jacoco:org.jacoco.core:0.8.11"
-    }
-}
-
-plugins {
-    id 'com.android.application'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'kotlin-allopen'
-}
-
-apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
-
-
-def generateGitBuild = { ->
-
-    StringBuilder stringBuilder = new StringBuilder()
-    stringBuilder.append('"')
-    try {
-        def stdout = new ByteArrayOutputStream()
-        exec {
-            commandLine 'git', 'describe', '--always'
-            standardOutput = stdout
-        }
-        String commitObject = stdout.toString().trim()
-        stringBuilder.append(commitObject)
-    } catch (ignored) {
-        stringBuilder.append('NoGitSystemAvailable')
-    }
-    stringBuilder.append('-')
-    stringBuilder.append((new Date()).format('yyyy.MM.dd'))
-    stringBuilder.append('"')
-    return stringBuilder.toString()
-}
-
-android {
-    namespace 'app.aaps.wear'
-
-    compileSdk 34
-
-    defaultConfig {
-        minSdkVersion 26
-        targetSdkVersion 29
-        versionCode 2
-        versionName "1.0.3"
-        buildConfigField "String", "BUILDVERSION", generateGitBuild()
-    }
-
-    buildFeatures {
-        viewBinding true
-    }
-
-    flavorDimensions = ["standard"]
-    productFlavors {
-        full {
-            isDefault = true
-            applicationId "info.nightscout.androidaps"
-            dimension "standard"
-            versionName version
-        }
-        pumpcontrol {
-            applicationId "info.nightscout.aapspumpcontrol"
-            dimension "standard"
-            versionName version + "-pumpcontrol"
-        }
-        aapsclient {
-            applicationId "info.nightscout.aapsclient"
-            dimension "standard"
-            versionName version + "-aapsclient"
-        }
-        aapsclient2 {
-            applicationId "info.nightscout.aapsclient2"
-            dimension "standard"
-            versionName version + "-aapsclient"
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    sourceSets {
-        main {
-            jniLibs.srcDirs = ['src/main/jniLibs']
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-
-    lint {
-        checkReleaseBuilds false
-        disable 'MissingTranslation'
-        disable 'ExtraTranslation'
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    apply plugin: 'jacoco'
-}
-
-
-dependencies {
-    implementation project(':shared:impl')
-    implementation project(':core:interfaces')
-
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-
-    implementation "androidx.appcompat:appcompat:$appcompat_version"
-    implementation "androidx.core:core-ktx:$core_version"
-    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation "androidx.preference:preference-ktx:$preferencektx_version"
-    implementation 'androidx.wear:wear:1.3.0'
-    implementation 'androidx.wear.tiles:tiles:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    testImplementation project(':shared:tests')
-
-    compileOnly "com.google.android.wearable:wearable:$wearable_version"
-    implementation "com.google.android.support:wearable:$wearable_version"
-    implementation "com.google.android.gms:play-services-wearable:$play_services_wearable_version"
-    implementation(files("${rootProject.rootDir}/core/libraries/libs/ustwo-clockwise-debug.aar"))
-    implementation(files("${rootProject.rootDir}/core/libraries/libs/wearpreferenceactivity-0.5.0.aar"))
-    implementation(files("${rootProject.rootDir}/core/libraries/libs/hellocharts-library-1.5.8.aar"))
-
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-guava:$coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-datetime:$kotlinx_datetime_version"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-
-    // for old fashioned support-app version
-    implementation "com.google.dagger:dagger:$dagger_version"
-    implementation "com.google.dagger:dagger-android:$dagger_version"
-    implementation "com.google.dagger:dagger-android-support:$dagger_version"
-
-    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
-    kapt "com.google.dagger:dagger-compiler:$dagger_version"
-}
-repositories {
-    mavenCentral()
-}
-
-// This is necessary to prevent Gradle build errors like:
-//
-//  Duplicate class androidx.lifecycle.ViewModelLazy found in modules jetified-lifecycle-viewmodel-ktx-2.3.1-runtime (androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1) and lifecycle-viewmodel-2.5.0-runtime (androidx.lifecycle:lifecycle-viewmodel:2.5.0)
-//
-// By explicitly adding these dependencies, the jetifier
-// is forced to use the correct lifecycle version instead
-// of automatically picking 2.3.1.
-//
-// See: https://stackoverflow.com/a/69832319/560774
-configurations {
-    all {
-        exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel-ktx'
-    }
-}
diff --git a/wear/build.gradle.kts b/wear/build.gradle.kts
new file mode 100644
index 0000000000..851d3be7b4
--- /dev/null
+++ b/wear/build.gradle.kts
@@ -0,0 +1,116 @@
+import java.io.ByteArrayOutputStream
+import java.text.SimpleDateFormat
+import java.util.Date
+
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+    id("kotlin-kapt")
+    id("android-app-dependencies")
+    id("test-app-dependencies")
+}
+
+apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
+
+repositories {
+    google()
+    mavenCentral()
+}
+
+fun generateGitBuild(): String {
+    val stringBuilder: StringBuilder = StringBuilder()
+    try {
+        val stdout = ByteArrayOutputStream()
+        exec {
+            commandLine("git", "describe", "--always")
+            standardOutput = stdout
+        }
+        val commitObject = stdout.toString().trim()
+        stringBuilder.append(commitObject)
+    } catch (ignored: Exception) {
+        stringBuilder.append("NoGitSystemAvailable")
+    }
+    return stringBuilder.toString()
+}
+
+fun generateDate(): String {
+    val stringBuilder: StringBuilder = StringBuilder()
+    // showing only date prevents app to rebuild everytime
+    stringBuilder.append(SimpleDateFormat("yyyy.MM.dd").format(Date()))
+    return stringBuilder.toString()
+}
+
+
+android {
+    namespace = "app.aaps.wear"
+
+    defaultConfig {
+        minSdk = Versions.wearMinSdk
+        targetSdk = Versions.wearTargetSdk
+
+        buildConfigField("String", "BUILDVERSION", "\"${generateGitBuild()}-${generateDate()}\"")
+    }
+
+    flavorDimensions.add("standard")
+    productFlavors {
+        create("full") {
+            isDefault = true
+            applicationId = "info.nightscout.androidaps"
+            dimension = "standard"
+            versionName = Versions.appVersion
+        }
+        create("pumpcontrol") {
+            applicationId = "info.nightscout.aapspumpcontrol"
+            dimension = "standard"
+            versionName = Versions.appVersion + "-pumpcontrol"
+        }
+        create("aapsclient") {
+            applicationId = "info.nightscout.aapsclient"
+            dimension = "standard"
+            versionName = Versions.appVersion + "-aapsclient"
+        }
+        create("aapsclient2") {
+            applicationId = "info.nightscout.aapsclient2"
+            dimension = "standard"
+            versionName = Versions.appVersion + "-aapsclient2"
+        }
+    }
+}
+
+allprojects {
+    repositories {
+    }
+}
+
+
+dependencies {
+    implementation(project(":shared:impl"))
+    implementation(project(":core:interfaces"))
+
+    implementation(Libs.AndroidX.appCompat)
+    implementation(Libs.AndroidX.core)
+    implementation(Libs.AndroidX.legacySupport)
+    implementation(Libs.AndroidX.preference)
+    implementation(Libs.AndroidX.Wear.wear)
+    implementation(Libs.AndroidX.Wear.tiles)
+    implementation(Libs.AndroidX.constraintLayout)
+
+    testImplementation(project(":shared:tests"))
+
+    compileOnly(Libs.Google.Android.Wearable.wearable)
+    implementation(Libs.Google.Android.Wearable.wearableSupport)
+    implementation(Libs.Google.Android.PlayServices.wearable)
+    implementation(files("${rootDir}/wear/libs/ustwo-clockwise-debug.aar"))
+    implementation(files("${rootDir}/wear/libs/wearpreferenceactivity-0.5.0.aar"))
+    implementation(files("${rootDir}/wear/libs/hellocharts-library-1.5.8.aar"))
+
+    implementation(Libs.KotlinX.coroutinesCore)
+    implementation(Libs.KotlinX.coroutinesAndroid)
+    implementation(Libs.KotlinX.coroutinesGuava)
+    implementation(Libs.KotlinX.coroutinesPlayServices)
+    implementation(Libs.KotlinX.datetime)
+    implementation(Libs.Kotlin.stdlibJdk8)
+
+    kapt(Libs.Dagger.androidProcessor)
+    kapt(Libs.Dagger.compiler)
+}
diff --git a/core/libraries/libs/hellocharts-library-1.5.8.aar b/wear/libs/hellocharts-library-1.5.8.aar
similarity index 100%
rename from core/libraries/libs/hellocharts-library-1.5.8.aar
rename to wear/libs/hellocharts-library-1.5.8.aar
diff --git a/core/libraries/libs/ustwo-clockwise-debug.aar b/wear/libs/ustwo-clockwise-debug.aar
similarity index 100%
rename from core/libraries/libs/ustwo-clockwise-debug.aar
rename to wear/libs/ustwo-clockwise-debug.aar
diff --git a/core/libraries/libs/wearpreferenceactivity-0.5.0.aar b/wear/libs/wearpreferenceactivity-0.5.0.aar
similarity index 100%
rename from core/libraries/libs/wearpreferenceactivity-0.5.0.aar
rename to wear/libs/wearpreferenceactivity-0.5.0.aar
diff --git a/workflow/build.gradle.kts b/workflow/build.gradle.kts
index eb7a2a47fd..3a6016a28a 100644
--- a/workflow/build.gradle.kts
+++ b/workflow/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("android-module-dependencies")
-    id("test-dependencies")
+    id("test-module-dependencies")
 }
 
 apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")