diff --git a/src/main/kotlin/no/iktdev/eventi/stores/TaskStore.kt b/src/main/kotlin/no/iktdev/eventi/stores/TaskStore.kt
index 02988d7..5f9a52a 100644
--- a/src/main/kotlin/no/iktdev/eventi/stores/TaskStore.kt
+++ b/src/main/kotlin/no/iktdev/eventi/stores/TaskStore.kt
@@ -9,7 +9,7 @@ interface TaskStore {
     fun persist(task: Task)
 
     fun findByTaskId(taskId: UUID): PersistedTask?
-    fun findByEventId(eventId: UUID): List<PersistedTask>
+    fun findByReferenceId(referenceId: UUID): List<PersistedTask>
     fun findUnclaimed(referenceId: UUID): List<PersistedTask>
 
     fun claim(taskId: UUID, workerId: String): Boolean
diff --git a/src/test/kotlin/no/iktdev/eventi/InMemoryTaskStore.kt b/src/test/kotlin/no/iktdev/eventi/InMemoryTaskStore.kt
index 6c0602e..8f46048 100644
--- a/src/test/kotlin/no/iktdev/eventi/InMemoryTaskStore.kt
+++ b/src/test/kotlin/no/iktdev/eventi/InMemoryTaskStore.kt
@@ -8,6 +8,7 @@ import no.iktdev.eventi.stores.TaskStore
 import java.time.Duration
 import java.time.LocalDateTime
 import java.util.UUID
+import kotlin.concurrent.atomics.AtomicReference
 
 open class InMemoryTaskStore : TaskStore {
     private val tasks = mutableListOf<PersistedTask>()
@@ -20,8 +21,8 @@ open class InMemoryTaskStore : TaskStore {
 
     override fun findByTaskId(taskId: UUID) = tasks.find { it.taskId == taskId }
 
-    override fun findByEventId(eventId: UUID) =
-        tasks.filter { it.data.contains(eventId.toString()) }
+    override fun findByReferenceId(referenceId: UUID) =
+        tasks.filter { it.referenceId == referenceId }
 
     override fun findUnclaimed(referenceId: UUID) =
         tasks.filter { it.referenceId == referenceId && !it.claimed && !it.consumed }