diff --git a/modules/events-processor-core/src/test/kotlin/dev/adamko/kafkatorio/processor/core/AuthenticatorTest.kt b/modules/events-processor-core/src/test/kotlin/dev/adamko/kafkatorio/processor/core/AuthenticatorTest.kt
index 5fb2d4f..c58ccf1 100644
--- a/modules/events-processor-core/src/test/kotlin/dev/adamko/kafkatorio/processor/core/AuthenticatorTest.kt
+++ b/modules/events-processor-core/src/test/kotlin/dev/adamko/kafkatorio/processor/core/AuthenticatorTest.kt
@@ -1,8 +1,8 @@
 package dev.adamko.kafkatorio.processor.core
 
+import dev.adamko.kafkatorio.processor.config.ApplicationProperties
+import dev.adamko.kafkatorio.processor.config.PortVal
 import dev.adamko.kafkatorio.schema.common.MaskedValue
-import dev.adamko.kafkatorio.server.config.ApplicationProperties
-import dev.adamko.kafkatorio.server.config.PortVal
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.nulls.shouldBeNull
 import io.kotest.matchers.nulls.shouldNotBeNull
diff --git a/modules/events-processor-core/src/test/kotlin/dev/adamko/kafkatorio/processor/core/topology/FactorioServerPacketsTest.kt b/modules/events-processor-core/src/test/kotlin/dev/adamko/kafkatorio/processor/core/topology/FactorioServerPacketsTest.kt
index b219310..a357b58 100644
--- a/modules/events-processor-core/src/test/kotlin/dev/adamko/kafkatorio/processor/core/topology/FactorioServerPacketsTest.kt
+++ b/modules/events-processor-core/src/test/kotlin/dev/adamko/kafkatorio/processor/core/topology/FactorioServerPacketsTest.kt
@@ -4,6 +4,8 @@ import dev.adamko.kafkatorio.library.kxsBinary
 import dev.adamko.kafkatorio.schema.common.ColourHex
 import dev.adamko.kafkatorio.schema.common.FactorioServerId
 import dev.adamko.kafkatorio.schema.common.ServerMapChunkId
+import dev.adamko.kafkatorio.server.processor.topology.ServerMapChunkTiles
+import dev.adamko.kafkatorio.server.processor.topology.factorioServerPacketStream
 import dev.adamko.kotka.kxs.serde
 import io.kotest.core.spec.style.FunSpec
 import kotlin.time.Duration
diff --git a/modules/events-processor-core/src/test/kotlin/dev/adamko/kafkatorio/processor/core/topology/SaveMapChunksTest.kt b/modules/events-processor-core/src/test/kotlin/dev/adamko/kafkatorio/processor/core/topology/SaveMapChunksTest.kt
index a82ce0e..ff66f41 100644
--- a/modules/events-processor-core/src/test/kotlin/dev/adamko/kafkatorio/processor/core/topology/SaveMapChunksTest.kt
+++ b/modules/events-processor-core/src/test/kotlin/dev/adamko/kafkatorio/processor/core/topology/SaveMapChunksTest.kt
@@ -11,6 +11,8 @@ import dev.adamko.kafkatorio.schema.common.MapTilePosition
 import dev.adamko.kafkatorio.schema.common.ServerMapChunkId
 import dev.adamko.kafkatorio.schema.common.ServerMapTileLayer
 import dev.adamko.kafkatorio.schema.common.SurfaceIndex
+import dev.adamko.kafkatorio.server.processor.topology.ServerMapChunkTiles
+import dev.adamko.kafkatorio.server.processor.topology.saveMapTiles
 import dev.adamko.kotka.kxs.serde
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.property.Arb
@@ -81,8 +83,12 @@ class SaveMapChunksTest : FunSpec({
       val now = LocalTime.now().format(DateTimeFormatter.ISO_TIME).filter { it.isLetterOrDigit() }
       Path("build/test/save-map-chunks-${now}")
     }
-    private val topology = saveMapTiles(streamsBuilder, outputDir)
-    private val testDriver: TopologyTestDriver = TopologyTestDriver(topology)
+    private val testDriver: TopologyTestDriver
+
+    init {
+      saveMapTiles(streamsBuilder, outputDir)
+      testDriver = TopologyTestDriver(streamsBuilder.build())
+    }
 
     val groupedMapChunksInputTopic: TestInputTopic<ServerMapChunkId, ServerMapChunkTiles<ColourHex>> =
       testDriver.createInputTopic(