diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AssertUtils.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AssertUtils.kt
index 6dee85580..dcaae150a 100644
--- a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AssertUtils.kt
+++ b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AssertUtils.kt
@@ -24,11 +24,11 @@ import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
 import junit.framework.TestCase
 
-fun EventStore.assertQuery(
-    expected: Event?,
+fun <T : Event> EventStore.assertQuery(
+    expected: T?,
     filter: Filter,
 ) {
-    val queryResult = query(filter)
+    val queryResult = query<T>(filter)
     val countResult = count(filter)
     if (expected == null) {
         TestCase.assertEquals(0, queryResult.size)
@@ -40,11 +40,11 @@ fun EventStore.assertQuery(
     }
 }
 
-fun EventStore.assertQuery(
-    expected: List<Event>,
+fun <T : Event> EventStore.assertQuery(
+    expected: List<T>,
     filter: Filter,
 ) {
-    val queryResult = query(filter)
+    val queryResult = query<T>(filter)
     val countResult = count(filter)
     TestCase.assertEquals(expected.size, queryResult.size)
     TestCase.assertEquals(expected.size, countResult)
@@ -53,11 +53,11 @@ fun EventStore.assertQuery(
     }
 }
 
-fun SQLiteEventStore.assertQuery(
-    expected: Event?,
+fun <T : Event> SQLiteEventStore.assertQuery(
+    expected: T?,
     filter: Filter,
 ) {
-    val queryResult = query(filter)
+    val queryResult = query<T>(filter)
     val countResult = count(filter)
     if (expected == null) {
         TestCase.assertEquals(0, queryResult.size)
@@ -69,11 +69,11 @@ fun SQLiteEventStore.assertQuery(
     }
 }
 
-fun SQLiteEventStore.assertQuery(
-    expected: List<Event>,
+fun <T : Event> SQLiteEventStore.assertQuery(
+    expected: List<T>,
     filter: Filter,
 ) {
-    val queryResult = query(filter)
+    val queryResult = query<T>(filter)
     val countResult = count(filter)
     TestCase.assertEquals(expected.size, queryResult.size)
     TestCase.assertEquals(expected.size, countResult)
diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/BasicTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/BasicTest.kt
index e7dc6f784..e0a6537bf 100644
--- a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/BasicTest.kt
+++ b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/BasicTest.kt
@@ -22,6 +22,7 @@ package com.vitorpamplona.quartz.nip01Core.store.sqlite
 
 import android.content.Context
 import androidx.test.core.app.ApplicationProvider
+import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
 import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync
@@ -203,7 +204,7 @@ class BasicTest {
         db.insertEvent(comment)
         db.insertEvent(profile)
 
-        db.query(Filter(tags = mapOf("I" to listOf("geo:drt3n")))) { event ->
+        db.query<Event>(Filter(tags = mapOf("I" to listOf("geo:drt3n")))) { event ->
             assertEquals(comment.toJson(), event.toJson())
         }
     }
@@ -234,7 +235,7 @@ class BasicTest {
         db.insertEvent(note3)
 
         val list =
-            db.query(
+            db.query<TextNoteEvent>(
                 Filter(
                     tags = mapOf("t" to listOf("AaAa")),
                 ),