diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/appconfig/mapping/ExposureDetectionConfigMapperTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/appconfig/mapping/ExposureDetectionConfigMapperTest.kt
index d93da32760a5af027f46add929fea19a347a4ce9..f39e4f9dee0a89f0d4d073cca27b76c99cabfe1b 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/appconfig/mapping/ExposureDetectionConfigMapperTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/appconfig/mapping/ExposureDetectionConfigMapperTest.kt
@@ -75,7 +75,6 @@ class ExposureDetectionConfigMapperTest : BaseTest() {
     @Test
     fun `if protobuf is missing the datastructure we return defaults`() {
         val rawConfig = AppConfigAndroid.ApplicationConfigurationAndroid.newBuilder()
-            .setMinRiskScore(1)
             .build()
         createInstance().map(rawConfig).apply {
             overallDetectionTimeout shouldBe Duration.standardMinutes(15)
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/nearby/windows/ExposureWindowsCalculationTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/nearby/windows/ExposureWindowsCalculationTest.kt
index 2bc5de6ff0d7862b2d98b659680e0ea76717718b..ece66bfcb20995de6a14d2bc80487d8022177d2b 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/nearby/windows/ExposureWindowsCalculationTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/nearby/windows/ExposureWindowsCalculationTest.kt
@@ -300,6 +300,7 @@ class ExposureWindowsCalculationTest : BaseTest() {
 
         testConfig = ConfigDataContainer(
             serverTime = Instant.now(),
+            cacheValidity = Duration.standardMinutes(5),
             localOffset = Duration.ZERO,
             mappedConfig = configData,
             identifier = "soup",
diff --git a/Corona-Warn-App/src/testDeviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModelTest.kt b/Corona-Warn-App/src/testDeviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModelTest.kt
index 2eb25af0cdcf0c4d52f3dded257154ee33eae5d8..42cc57dc1358757b6fa3f751e42ed6e64b68932c 100644
--- a/Corona-Warn-App/src/testDeviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModelTest.kt
+++ b/Corona-Warn-App/src/testDeviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModelTest.kt
@@ -6,6 +6,7 @@ import com.google.android.gms.nearby.exposurenotification.ExposureNotificationCl
 import de.rki.coronawarnapp.appconfig.AppConfigProvider
 import de.rki.coronawarnapp.diagnosiskeys.storage.KeyCacheRepository
 import de.rki.coronawarnapp.nearby.ENFClient
+import de.rki.coronawarnapp.risk.ExposureResultStore
 import de.rki.coronawarnapp.risk.RiskLevels
 import de.rki.coronawarnapp.task.TaskController
 import de.rki.coronawarnapp.ui.tracing.card.TracingCardStateProvider
@@ -41,6 +42,7 @@ class TestRiskLevelCalculationFragmentCWAViewModelTest : BaseTest() {
     @MockK lateinit var taskController: TaskController
     @MockK lateinit var riskLevels: RiskLevels
     @MockK lateinit var appConfigProvider: AppConfigProvider
+    @MockK lateinit var exposureResultStore: ExposureResultStore
 
     @BeforeEach
     fun setup() {
@@ -68,7 +70,8 @@ class TestRiskLevelCalculationFragmentCWAViewModelTest : BaseTest() {
             dispatcherProvider = TestDispatcherProvider,
             riskLevels = riskLevels,
             taskController = taskController,
-            appConfigProvider = appConfigProvider
+            appConfigProvider = appConfigProvider,
+            exposureResultStore = exposureResultStore
         )
 
     @Test