diff --git a/gradlescripts/testdependencies.gradle b/gradlescripts/testdependencies.gradle
index 34c0afb..f4ce4b8 100644
--- a/gradlescripts/testdependencies.gradle
+++ b/gradlescripts/testdependencies.gradle
@@ -28,8 +28,8 @@ project.ext {
      */
 
     def propertyOrNull = { key ->
-        if (hasProperty(key)) {
-            return property(key)
+        if (extensions.extraProperties.has(key)) {
+            return extensions.extraProperties.get(key)
         } else {
             return null
         }
@@ -37,22 +37,22 @@ project.ext {
 
     // ------------------VERSIONS------------------
     def testing_junit5_version = propertyOrNull('junit5_version') ?: "5.7.0"
-    def testing_junit4_version = propertyOrNull('juni4_version') ?: "4.13.2"
+    def testing_junit4_version = propertyOrNull('junit4_version') ?: "4.13.2"
     def testing_robolectric_version = propertyOrNull('robolectric_version') ?: "4.7"
     def testing_androidx_code_version = propertyOrNull('androidx_test_version') ?: "1.4.0"
     def testing_androidx_junit_version = propertyOrNull('androidx_junit_version') ?: "1.1.3"
     def testing_espresso_version = propertyOrNull('espresso_version') ?: "3.4.0"
     def testing_androidx_arch_core_version = propertyOrNull('arch_core_version') ?: "2.1.0"
     def test_coroutines_version = propertyOrNull('coroutines_version') ?: "1.6.0"
-    def testing_kotlin_mockito_version = propertyOrNull('mockito_version') ?: "3.1.0"
+    def testing_kotlin_mockito_version = propertyOrNull('mockito_version') ?: "4.0.0"
     def testing_koin_version = propertyOrNull('koin_version') ?: "3.1.2"
     def testing_json_assert_version = propertyOrNull('json_assert_version') ?: "1.5.0"
     def testing_okhttp3 = propertyOrNull('okhttp_version') ?: "4.9.3"
     def testing_turbine_version = propertyOrNull('turbine_version') ?: "0.7.0"
     def testing_androidx_room_version = propertyOrNull('room_version') ?: "2.4.2"
     def testing_livedata_version = propertyOrNull('testing_livedata_version') ?: "1.2.0"
-    def testing_compose_version = propertyOrNull('compose_version') ?: "1.1.0"
-    def testing_hamcrest_version = propertyOrNull('hamcrest_version')?: "2.2"
+    def testing_compose_version = propertyOrNull('androidx_compose_version') ?: "1.1.0"
+    def testing_hamcrest_version = propertyOrNull('hamcrest_version') ?: "2.2"
 
     // ------------------PRIVATE------------------
     // JUni4 + Espresso + Room
diff --git a/gradlescripts/versions.gradle b/gradlescripts/versions.gradle
index 42bc419..7c1f9da 100644
--- a/gradlescripts/versions.gradle
+++ b/gradlescripts/versions.gradle
@@ -14,21 +14,24 @@ project.ext {
     androidx_compose_constraintlayout_version = "1.0.0"
 
     coroutines_version = "1.6.0"
-    turbine_version = "0.7.0"
     koin_version = "3.1.2"
     coil_version = "1.4.0"
     retrofit_version = "2.9.0"
     okhttp_version = "4.9.3"
     moshi_version = "1.13.0"
 
+    // testing versions
+    turbine_version = "0.7.0"
     androidx_test_version = "1.4.0"
-    testing_androidx_junit_version = "1.1.3"
+    androidx_junit_version = "1.1.3"
     arch_core_version = "2.1.0"
     testing_livedata_version = "1.2.0"
-    testing_kotlin_mockito_version = "4.0.0"
+    mockito_version = "4.0.0"
+    println("MYLOG versions set")
     junit5_version = "5.7.0"
-    testing_json_assert_version = "1.5.0"
-    testing_junit4_version = "4.13.2"
-    testing_robolectric_version = "4.7"
+    json_assert_version = "1.5.0"
+    junit4_version = "4.13.2"
+    robolectric_version = "4.7"
     espresso_version = "3.4.0"
+    hamcrest_version = "2.2"
 }
\ No newline at end of file
diff --git a/mockserver/build.gradle b/mockserver/build.gradle
index 4b481ef..03f8e01 100644
--- a/mockserver/build.gradle
+++ b/mockserver/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     api "com.squareup.okhttp3:mockwebserver:$okhttp_version"
     api "com.squareup.okhttp3:okhttp-tls:$okhttp_version"
 
-    implementation "org.skyscreamer:jsonassert:$testing_json_assert_version"
-    implementation "junit:junit:$testing_junit4_version"
+    implementation "org.skyscreamer:jsonassert:$json_assert_version"
+    implementation "junit:junit:$junit4_version"
 
 }
\ No newline at end of file
diff --git a/test-util-android/build.gradle b/test-util-android/build.gradle
index 6530663..4f1819a 100644
--- a/test-util-android/build.gradle
+++ b/test-util-android/build.gradle
@@ -27,6 +27,9 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    buildFeatures {
+        buildConfig = false
+    }
 }
 
 dependencies {
diff --git a/test-util-junit5-android/build.gradle b/test-util-junit5-android/build.gradle
index 23b7bdc..f700de7 100644
--- a/test-util-junit5-android/build.gradle
+++ b/test-util-junit5-android/build.gradle
@@ -27,6 +27,9 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    buildFeatures {
+        buildConfig = false
+    }
 }
 
 dependencies {
diff --git a/test-util-shared-android/build.gradle b/test-util-shared-android/build.gradle
index bf17210..36a2f69 100644
--- a/test-util-shared-android/build.gradle
+++ b/test-util-shared-android/build.gradle
@@ -27,6 +27,9 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    buildFeatures {
+        buildConfig = false
+    }
 }
 
 dependencies {
diff --git a/test-util-shared-robolectric/build.gradle b/test-util-shared-robolectric/build.gradle
index ed8dde6..8bcb73a 100644
--- a/test-util-shared-robolectric/build.gradle
+++ b/test-util-shared-robolectric/build.gradle
@@ -27,6 +27,9 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    buildFeatures {
+        buildConfig = false
+    }
 }
 
 dependencies {