diff --git a/corellium/domain/src/main/kotlin/flank/corellium/domain/TestAndroid.kt b/corellium/domain/src/main/kotlin/flank/corellium/domain/TestAndroid.kt
index 55197bee62..7d59db21d9 100644
--- a/corellium/domain/src/main/kotlin/flank/corellium/domain/TestAndroid.kt
+++ b/corellium/domain/src/main/kotlin/flank/corellium/domain/TestAndroid.kt
@@ -135,16 +135,16 @@ object TestAndroid {
         val junit by !type<JUnit.Api>()
         val args by !Args
 
-        val dispatch by -Dispatch.Shards
-        val devices by -AvailableDevices
-        val results by -ExecuteTests.Results
+        val packageNames: Map<String, String> by ParseApkInfo { packageNames }
+        val testRunners: Map<String, String> by ParseApkInfo { testRunners }
         val testCases: Map<String, List<String>> by -ParseTestCases
-        val previousDurations: Map<String, Long> by -LoadPreviousDurations
         val shards: List<List<Shard.App>> by -PrepareShards
+        val previousDurations: Map<String, Long> by -LoadPreviousDurations
+        val results: Channel<ExecuteTests.Result> by -ExecuteTests.Results
+        val dispatch: Channel<Dispatch.Data> by -Dispatch.Shards
+        val devices: Channel<Device.Instance> by -AvailableDevices
         val ids: List<String> by -InvokeDevices
-        val packageNames by ParseApkInfo { packageNames }
-        val testRunners by ParseApkInfo { testRunners }
-        val testResult by -ExecuteTests
+        val testResult: List<Device.Result> by -ExecuteTests
     }
 
     internal val context = Parallel.Function(::Context)