diff --git a/app/build.gradle b/app/build.gradle
index 7f2fed1..6ac067b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -64,6 +64,7 @@ dependencies {
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:5.8.0'
+    testImplementation 'org.hamcrest:hamcrest:2.2'
 }
 repositories {
     mavenCentral()
diff --git a/app/src/test/java/de/devmil/paperlaunch/config/UserSettingsTest.kt b/app/src/test/java/de/devmil/paperlaunch/config/UserSettingsTest.kt
index 65a853a..e8d3b8d 100644
--- a/app/src/test/java/de/devmil/paperlaunch/config/UserSettingsTest.kt
+++ b/app/src/test/java/de/devmil/paperlaunch/config/UserSettingsTest.kt
@@ -5,10 +5,10 @@ import android.content.SharedPreferences
 import junit.framework.Assert.*
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Matchers.*
+import org.mockito.ArgumentMatchers.*
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.mockito.runners.MockitoJUnitRunner
+import org.mockito.junit.MockitoJUnitRunner
 
 
 @RunWith(MockitoJUnitRunner::class)
diff --git a/app/src/test/java/de/devmil/paperlaunch/model/FolderTest.kt b/app/src/test/java/de/devmil/paperlaunch/model/FolderTest.kt
index 49bca4f..a7e4584 100644
--- a/app/src/test/java/de/devmil/paperlaunch/model/FolderTest.kt
+++ b/app/src/test/java/de/devmil/paperlaunch/model/FolderTest.kt
@@ -9,7 +9,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.mockito.runners.MockitoJUnitRunner
+import org.mockito.junit.MockitoJUnitRunner
 
 @RunWith(MockitoJUnitRunner::class)
 class FolderTest {
diff --git a/app/src/test/java/de/devmil/paperlaunch/model/LaunchTest.kt b/app/src/test/java/de/devmil/paperlaunch/model/LaunchTest.kt
index 812a4dc..e69243f 100644
--- a/app/src/test/java/de/devmil/paperlaunch/model/LaunchTest.kt
+++ b/app/src/test/java/de/devmil/paperlaunch/model/LaunchTest.kt
@@ -12,7 +12,7 @@ import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito
 import org.mockito.Mockito.`when`
-import org.mockito.runners.MockitoJUnitRunner
+import org.mockito.junit.MockitoJUnitRunner
 
 @RunWith(MockitoJUnitRunner::class)
 class LaunchTest {
diff --git a/app/src/test/java/de/devmil/paperlaunch/model/VirtualFolderTest.kt b/app/src/test/java/de/devmil/paperlaunch/model/VirtualFolderTest.kt
index 17b8777..94fe87d 100644
--- a/app/src/test/java/de/devmil/paperlaunch/model/VirtualFolderTest.kt
+++ b/app/src/test/java/de/devmil/paperlaunch/model/VirtualFolderTest.kt
@@ -5,7 +5,7 @@ import junit.framework.Assert.*
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.mockito.runners.MockitoJUnitRunner
+import org.mockito.junit.MockitoJUnitRunner
 
 @RunWith(MockitoJUnitRunner::class)
 class VirtualFolderTest {
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755