diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/CoronaTestRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/CoronaTestRepository.kt
index 3e35ebfa07e11b1194ca6d8a214f785906ef1b10..bcac8ebee45f9369f3d20b72caac8a8e684597f9 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/CoronaTestRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/CoronaTestRepository.kt
@@ -188,7 +188,7 @@ class CoronaTestRepository @Inject constructor(
             }
         }
 
-        return refreshedData.values.toSet()
+        return refreshedData.values.filter { toRefresh.contains(it.identifier) }.toSet()
     }
 
     suspend fun clear() {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/pcr/execution/PCRResultRetrievalWorker.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/pcr/execution/PCRResultRetrievalWorker.kt
index 74c5e98d67fe5a1bbaf3e5fc138846e167dbc4f6..0a9076d068d9f72f8bc9c1c6a41ba569d0cffeb8 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/pcr/execution/PCRResultRetrievalWorker.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/pcr/execution/PCRResultRetrievalWorker.kt
@@ -9,7 +9,6 @@ import dagger.assisted.AssistedInject
 import de.rki.coronawarnapp.coronatest.CoronaTestRepository
 import de.rki.coronawarnapp.coronatest.latestPCRT
 import de.rki.coronawarnapp.coronatest.type.CoronaTest
-import de.rki.coronawarnapp.coronatest.type.pcr.PCRCoronaTest
 import de.rki.coronawarnapp.util.worker.InjectedWorkerFactory
 import de.rki.coronawarnapp.worker.BackgroundConstants
 import kotlinx.coroutines.flow.first
@@ -42,12 +41,9 @@ class PCRResultRetrievalWorker @AssistedInject constructor(
                 return Result.success()
             }
 
-            Timber.tag(TAG).d(" $id Running task.")
-            val coronaTest = coronaTestRepository.refresh(
-                type = CoronaTest.Type.PCR
-            ).single() as PCRCoronaTest
-            val testResult = coronaTest.testResult
-            Timber.tag(TAG).d("$id: Test result retrieved is $testResult")
+            Timber.tag(TAG).v("$id Running PCR test result refresh.")
+            coronaTestRepository.refresh(type = CoronaTest.Type.PCR)
+            Timber.tag(TAG).d("$id: PCR test result refreshed.")
 
             return Result.success()
         } catch (e: Exception) {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/rapidantigen/execution/RAResultRetrievalWorker.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/rapidantigen/execution/RAResultRetrievalWorker.kt
index f390af2d9402a3847e19e32251bb96a3764a1d7e..33e3b2f49757e30b24a3cbceaba88c3acc272035 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/rapidantigen/execution/RAResultRetrievalWorker.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/rapidantigen/execution/RAResultRetrievalWorker.kt
@@ -46,8 +46,9 @@ class RAResultRetrievalWorker @AssistedInject constructor(
                 Timber.tag(TAG).w("There is no RapidAntigen test available!?")
                 return Result.success()
             }
-
+            Timber.tag(TAG).v("$id Running RA test result refresh.")
             coronaTestRepository.refresh(CoronaTest.Type.RAPID_ANTIGEN)
+            Timber.tag(TAG).d("$id: RA test result refreshed.")
 
             val nowUTC = timeStamper.nowUTC
             val days = Duration(rat.registeredAt, nowUTC).standardDays