diff --git a/integrations/postgresql/build.gradle.kts b/integrations/postgresql/build.gradle.kts
index 6e0cc9d9b..e30f8dce9 100644
--- a/integrations/postgresql/build.gradle.kts
+++ b/integrations/postgresql/build.gradle.kts
@@ -51,3 +51,7 @@ tasks {
 
     withType<AbstractPublishToMaven> { dependsOn(withType<Sign>()) }
 }
+
+tasks.test{
+    useJUnitPlatform()
+}
diff --git a/integrations/postgresql/src/main/kotlin/com/xebia/functional/xef/store/postgresql/postgres.kt b/integrations/postgresql/src/main/kotlin/com/xebia/functional/xef/store/postgresql/postgres.kt
index f2df3023a..4f4cef72d 100644
--- a/integrations/postgresql/src/main/kotlin/com/xebia/functional/xef/store/postgresql/postgres.kt
+++ b/integrations/postgresql/src/main/kotlin/com/xebia/functional/xef/store/postgresql/postgres.kt
@@ -49,7 +49,7 @@ fun createEmbeddingTable(vectorSize: Int): String =
 
 val addNewMemory: String =
   """INSERT INTO xef_memory(uuid, conversation_id, role, content, index)
-     VALUES (?, ?, ?, ?, ?, ?)
+     VALUES (?, ?, ?, ?, ?)
      ON CONFLICT DO NOTHING;"""
     .trimIndent()
 
diff --git a/integrations/postgresql/src/main/resources/vectorStore/migrations/V1__Initial.sql b/integrations/postgresql/src/main/resources/vectorStore/migrations/V1__Initial.sql
index e99b2200c..4a4671806 100644
--- a/integrations/postgresql/src/main/resources/vectorStore/migrations/V1__Initial.sql
+++ b/integrations/postgresql/src/main/resources/vectorStore/migrations/V1__Initial.sql
@@ -20,7 +20,7 @@ CREATE TABLE IF NOT EXISTS xef_memory (
 CREATE TABLE IF NOT EXISTS xef_embeddings (
        uuid TEXT PRIMARY KEY,
        collection_id TEXT REFERENCES xef_collections(uuid),
-       embedding vector(3),
+       embedding vector(1536),
        content TEXT
      );
 
diff --git a/integrations/postgresql/src/test/kotlin/xef/MemoryData.kt b/integrations/postgresql/src/test/kotlin/xef/MemoryData.kt
new file mode 100644
index 000000000..3fb9ad4d4
--- /dev/null
+++ b/integrations/postgresql/src/test/kotlin/xef/MemoryData.kt
@@ -0,0 +1,27 @@
+package xef
+
+import arrow.atomic.AtomicInt
+import com.xebia.functional.xef.llm.models.chat.Message
+import com.xebia.functional.xef.llm.models.chat.Role
+import com.xebia.functional.xef.store.ConversationId
+import com.xebia.functional.xef.store.Memory
+
+class MemoryData {
+    val defaultConversationId = ConversationId("default-id")
+
+    val atomicInt = AtomicInt(0)
+
+    fun generateRandomMessages(
+        n: Int,
+        append: String? = null,
+        conversationId: ConversationId = defaultConversationId
+    ): List<Memory> =
+        (0 until n).flatMap {
+            val m1 = Message(Role.USER, "Question $it${append?.let { ": $it" } ?: ""}", Role.USER.toString().lowercase())
+            val m2 = Message(Role.ASSISTANT, "Response $it${append?.let { ": $it" } ?: ""}", Role.ASSISTANT.toString().lowercase())
+            listOf(
+                Memory(conversationId, m1, atomicInt.addAndGet(1)),
+                Memory(conversationId, m2, atomicInt.addAndGet(1)),
+            )
+        }
+}
diff --git a/integrations/postgresql/src/test/kotlin/xef/PGVectorStoreSpec.kt b/integrations/postgresql/src/test/kotlin/xef/PGVectorStoreSpec.kt
index 8e95d55d1..ad03b13fb 100644
--- a/integrations/postgresql/src/test/kotlin/xef/PGVectorStoreSpec.kt
+++ b/integrations/postgresql/src/test/kotlin/xef/PGVectorStoreSpec.kt
@@ -9,8 +9,7 @@ import com.xebia.functional.xef.llm.models.embeddings.Embedding
 import com.xebia.functional.xef.llm.models.embeddings.EmbeddingRequest
 import com.xebia.functional.xef.llm.models.embeddings.EmbeddingResult
 import com.xebia.functional.xef.llm.models.embeddings.RequestConfig
-import com.xebia.functional.xef.store.ConversationId
-import com.xebia.functional.xef.store.Memory
+import com.xebia.functional.xef.llm.models.usage.Usage
 import com.xebia.functional.xef.store.PGVectorStore
 import com.xebia.functional.xef.store.postgresql.PGDistanceStrategy
 import com.zaxxer.hikari.HikariConfig
@@ -20,8 +19,6 @@ import io.kotest.core.spec.style.StringSpec
 import io.kotest.extensions.testcontainers.ContainerExtension
 import io.kotest.matchers.shouldBe
 import kotlinx.coroutines.flow.Flow
-import kotlinx.uuid.UUID
-import kotlinx.uuid.generateUUID
 import org.junit.jupiter.api.assertThrows
 import org.testcontainers.containers.PostgreSQLContainer
 import org.testcontainers.utility.DockerImageName
@@ -93,19 +90,11 @@ class PGVectorStoreSpec :
     }
 
     "the added memories sorted by index should be obtained in the same order" {
-      val messages = 10
+      val memoryData = MemoryData()
       val llm = TestLLM()
-      val conversationId = ConversationId(UUID.generateUUID().toString())
-      val memories = (0 until messages).flatMap {
-        val m1 = Message(Role.USER, "question $it", "user")
-        val m2 = Message(Role.ASSISTANT, "answer $it", "assistant")
-        listOf(
-          Memory(conversationId, m1, 1),
-          Memory(conversationId, m2, 2)
-        )
-      }
+      val memories = memoryData.generateRandomMessages(10)
       pg.addMemories(memories)
-      memories shouldBe pg.memories(llm, conversationId, 1000)
+      memories shouldBe pg.memories(llm, memoryData.defaultConversationId, 1000)
     }
   })
 
@@ -130,11 +119,9 @@ class TestLLM(override val modelType: ModelType = ModelType.ADA) : Chat, AutoClo
   }
 }
 
-
-
 private fun Embeddings.Companion.mock(
   embedDocuments:
-  suspend (texts: List<String>, chunkSize: Int?, config: RequestConfig) -> List<Embedding> =
+  suspend (texts: List<String>, config: RequestConfig, chunkSize: Int?) -> List<Embedding> =
     { _, _, _ ->
       listOf(Embedding(listOf(1.0f, 2.0f, 3.0f)), Embedding(listOf(4.0f, 5.0f, 6.0f)))
     },
@@ -145,6 +132,9 @@ private fun Embeddings.Companion.mock(
       "baz" -> listOf()
       else -> listOf()
     }
+  },
+  createEmbeddings: suspend (request: EmbeddingRequest) -> EmbeddingResult = { _ ->
+    EmbeddingResult(listOf(Embedding(listOf(1.0f, 2.0f, 3.0f)), Embedding(listOf(4.0f, 5.0f, 6.0f))), Usage.ZERO)
   }
 ): Embeddings =
   object : Embeddings {
diff --git a/server/src/main/kotlin/com/xebia/functional/xef/server/services/PostgresVectorStoreService.kt b/server/src/main/kotlin/com/xebia/functional/xef/server/services/PostgresVectorStoreService.kt
index 0a01570e7..4b6799114 100644
--- a/server/src/main/kotlin/com/xebia/functional/xef/server/services/PostgresVectorStoreService.kt
+++ b/server/src/main/kotlin/com/xebia/functional/xef/server/services/PostgresVectorStoreService.kt
@@ -24,7 +24,7 @@ object PostgreSQLXef {
 
   data class PGVectorStoreConfig(
     val dbConfig: DBConfig,
-    val vectorSize: Int = 3,
+    val vectorSize: Int = 1536, // OpenAI default
     val collectionName: String = "xef_collection",
     val preDeleteCollection: Boolean = false,
     val chunkSize: Int? = null,