diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/internal/TaskModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/internal/TaskModule.kt
index bc815e3040b8a41cc7b389d7baf59781f43efea8..179d8edbde1c58dcc8672b20c32f3a2ba9de286d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/internal/TaskModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/internal/TaskModule.kt
@@ -3,15 +3,10 @@ package de.rki.coronawarnapp.task.internal
 import dagger.Module
 import dagger.Provides
 import de.rki.coronawarnapp.task.TaskCoroutineScope
-import de.rki.coronawarnapp.task.example.QueueingTaskModule
 import kotlinx.coroutines.CoroutineScope
 import javax.inject.Singleton
 
-@Module(
-    includes = [
-        QueueingTaskModule::class
-    ]
-)
+@Module
 class TaskModule {
 
     @Provides
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/TaskControllerTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/TaskControllerTest.kt
index 22595f0c3df4cbee7984b097e5528d19d122db34..71370335eeb30b6f17ba1c479cb12a3d0c467da3 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/TaskControllerTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/TaskControllerTest.kt
@@ -3,10 +3,10 @@ package de.rki.coronawarnapp.task
 import de.rki.coronawarnapp.bugreporting.reportProblem
 import de.rki.coronawarnapp.exception.reporting.report
 import de.rki.coronawarnapp.task.common.DefaultTaskRequest
-import de.rki.coronawarnapp.task.example.QueueingTask
 import de.rki.coronawarnapp.task.testtasks.SkippingTask
 import de.rki.coronawarnapp.task.testtasks.alerterror.AlertErrorTask
 import de.rki.coronawarnapp.task.testtasks.precondition.PreconditionTask
+import de.rki.coronawarnapp.task.testtasks.queue.QueueingTask
 import de.rki.coronawarnapp.task.testtasks.silenterror.SilentErrorTask
 import de.rki.coronawarnapp.task.testtasks.timeout.TimeoutTask
 import de.rki.coronawarnapp.task.testtasks.timeout.TimeoutTask2
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/testtasks/SkippingTask.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/testtasks/SkippingTask.kt
index cb0848c9fbbb770cbb8baa2f7c3ee8b4b073b65e..1b0b3c944725d2499b6f232044132929c6ff569e 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/testtasks/SkippingTask.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/testtasks/SkippingTask.kt
@@ -3,7 +3,7 @@ package de.rki.coronawarnapp.task.testtasks
 import de.rki.coronawarnapp.task.Task
 import de.rki.coronawarnapp.task.TaskFactory
 import de.rki.coronawarnapp.task.common.DefaultProgress
-import de.rki.coronawarnapp.task.example.QueueingTask
+import de.rki.coronawarnapp.task.testtasks.queue.QueueingTask
 import org.joda.time.Duration
 import javax.inject.Inject
 import javax.inject.Provider
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/example/QueueingTask.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/testtasks/queue/QueueingTask.kt
similarity index 98%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/example/QueueingTask.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/testtasks/queue/QueueingTask.kt
index d34f0e8890919b779fb7a51dc598213b1a255f5b..0c7d67d9dab2f9243f9043d362741b39614948c2 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/example/QueueingTask.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/testtasks/queue/QueueingTask.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.task.example
+package de.rki.coronawarnapp.task.testtasks.queue
 
 import de.rki.coronawarnapp.task.Task
 import de.rki.coronawarnapp.task.TaskCancellationException
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/example/QueueingTaskModule.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/testtasks/queue/QueueingTaskModule.kt
similarity index 89%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/example/QueueingTaskModule.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/testtasks/queue/QueueingTaskModule.kt
index 3b15fdb8f85de48ffef00ac92f3fd0f17186d7f8..ff14228d2d669b0f647ff5fc6795d17b08f3c00d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/example/QueueingTaskModule.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/testtasks/queue/QueueingTaskModule.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.task.example
+package de.rki.coronawarnapp.task.testtasks.queue
 
 import dagger.Binds
 import dagger.Module