diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/exception/CwaSecurityException.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/exception/CwaSecurityException.kt
index 95c6617ea83e09ff8b12bcee12d293a7b91037cc..fbf60797aa2cf186f5ebfaa99345b743ca737066 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/exception/CwaSecurityException.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/exception/CwaSecurityException.kt
@@ -6,6 +6,6 @@ import de.rki.coronawarnapp.exception.reporting.ReportedException
 class CwaSecurityException(cause: Throwable) : ReportedException(
     ErrorCodes.CWA_SECURITY_PROBLEM.code,
     "something went wrong during a critical part of the application ensuring security, please refer" +
-            "to the details for more information",
+            " to the details for more information",
     cause
 )
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/SubmissionRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/SubmissionRepository.kt
index 6a240038067b2729575d0b050e9077db302cd8e6..b59ef194e3fea7519cc81a7548f9247ae1c13350 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/SubmissionRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/SubmissionRepository.kt
@@ -198,6 +198,7 @@ class SubmissionRepository @Inject constructor(
         LocalData.registrationToken(null)
         LocalData.devicePairingSuccessfulTimestamp(0L)
         LocalData.initialPollingForTestResultTimeStamp(0L)
+        LocalData.initialTestResultReceivedTimestamp(0L)
         LocalData.isAllowedToSubmitDiagnosisKeys(false)
         LocalData.isTestResultNotificationSent(false)
     }
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/storage/SubmissionRepositoryTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/storage/SubmissionRepositoryTest.kt
index 5bcb8a3d714ab35916ed6ebf5d9614c9e2d044c8..c814341bd10a65af6efdfe97604eb0d29ec8de6b 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/storage/SubmissionRepositoryTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/storage/SubmissionRepositoryTest.kt
@@ -97,6 +97,7 @@ class SubmissionRepositoryTest {
         val submissionRepository = createInstance(scope = this)
 
         every { LocalData.initialPollingForTestResultTimeStamp(any()) } just Runs
+        every { LocalData.initialTestResultReceivedTimestamp(any()) } just Runs
         every { LocalData.isAllowedToSubmitDiagnosisKeys(any()) } just Runs
         every { LocalData.isTestResultNotificationSent(any()) } just Runs
 
@@ -106,6 +107,7 @@ class SubmissionRepositoryTest {
             LocalData.registrationToken(null)
             LocalData.devicePairingSuccessfulTimestamp(0L)
             LocalData.initialPollingForTestResultTimeStamp(0L)
+            LocalData.initialTestResultReceivedTimestamp(0L)
             LocalData.isAllowedToSubmitDiagnosisKeys(false)
             LocalData.isTestResultNotificationSent(false)
         }