diff --git a/src/Abstractions/src/MessageHistory/FileChatMessageHistory.cs b/src/Abstractions/src/MessageHistory/FileChatMessageHistory.cs
index 56ed972..55b113c 100644
--- a/src/Abstractions/src/MessageHistory/FileChatMessageHistory.cs
+++ b/src/Abstractions/src/MessageHistory/FileChatMessageHistory.cs
@@ -36,6 +36,8 @@ private FileChatMessageHistory(string messagesFilePath)
     /// </summary>
     /// <param name="path">path of the local file to store the messages</param>
     /// <param name="cancellationToken"></param>
+    [RequiresUnreferencedCode()]
+    [RequiresDynamicCode()]
     public static async Task<FileChatMessageHistory> CreateAsync(string path, CancellationToken cancellationToken = default)
     {
         FileChatMessageHistory chatHistory = new FileChatMessageHistory(path);
@@ -45,6 +47,8 @@ public static async Task<FileChatMessageHistory> CreateAsync(string path, Cancel
     }
 
     /// <inheritdoc/>
+    [RequiresUnreferencedCode()]
+    [RequiresDynamicCode()]
     public override Task AddMessage(ChatMessage message)
     {
         _messages.Add(message);
@@ -54,6 +58,8 @@ public override Task AddMessage(ChatMessage message)
     }
 
     /// <inheritdoc/>
+    [RequiresUnreferencedCode()]
+    [RequiresDynamicCode()]
     public override Task Clear()
     {
         _messages.Clear();
diff --git a/src/IntegrationTests/DatabaseTests.cs b/src/IntegrationTests/DatabaseTests.cs
index 144bd21..fd29f4f 100644
--- a/src/IntegrationTests/DatabaseTests.cs
+++ b/src/IntegrationTests/DatabaseTests.cs
@@ -8,6 +8,7 @@ public partial class DatabaseTests
     [TestCase(SupportedDatabase.InMemory)]
     [TestCase(SupportedDatabase.Postgres)]
     [TestCase(SupportedDatabase.OpenSearch)]
+    [Obsolete]
     public async Task CreateAndDeleteCollection_Ok(SupportedDatabase database)
     {
         await using var environment = await StartEnvironmentForAsync(database);
@@ -38,6 +39,7 @@ public async Task CreateAndDeleteCollection_Ok(SupportedDatabase database)
     [TestCase(SupportedDatabase.InMemory)]
     [TestCase(SupportedDatabase.Postgres)]
     [TestCase(SupportedDatabase.OpenSearch)]
+    [Obsolete]
     public async Task UpsertAndGet_Ok(SupportedDatabase database)
     {
         await using var environment = await StartEnvironmentForAsync(database);
@@ -72,6 +74,7 @@ public async Task UpsertAndGet_Ok(SupportedDatabase database)
     [TestCase(SupportedDatabase.InMemory)]
     [TestCase(SupportedDatabase.Postgres)]
     [TestCase(SupportedDatabase.OpenSearch)]
+    [Obsolete]
     public async Task BatchUpsertAndGet_Ok(SupportedDatabase database)
     {
         await using var environment = await StartEnvironmentForAsync(database);
@@ -98,6 +101,7 @@ public async Task BatchUpsertAndGet_Ok(SupportedDatabase database)
     [TestCase(SupportedDatabase.InMemory)]
     [TestCase(SupportedDatabase.Postgres)]
     [TestCase(SupportedDatabase.OpenSearch)]
+    [Obsolete]
     public async Task DeleteRecord_Ok(SupportedDatabase database)
     {
         await using var environment = await StartEnvironmentForAsync(database);
@@ -125,6 +129,7 @@ public async Task DeleteRecord_Ok(SupportedDatabase database)
     [TestCase(SupportedDatabase.InMemory)]
     [TestCase(SupportedDatabase.Postgres)]
     [TestCase(SupportedDatabase.OpenSearch)]
+    [Obsolete]
     public async Task BatchDelete_Ok(SupportedDatabase database)
     {
         await using var environment = await StartEnvironmentForAsync(database);
@@ -169,6 +174,7 @@ public async Task BatchDelete_Ok(SupportedDatabase database)
     [TestCase(SupportedDatabase.InMemory)]
     [TestCase(SupportedDatabase.Postgres)]
     [TestCase(SupportedDatabase.OpenSearch)]
+    [Obsolete]
     public async Task GetServiceMetadata_Ok(SupportedDatabase database)
     {
         await using var environment = await StartEnvironmentForAsync(database);
@@ -190,6 +196,7 @@ public async Task GetServiceMetadata_Ok(SupportedDatabase database)
     [TestCase(SupportedDatabase.InMemory)]
     [TestCase(SupportedDatabase.Postgres)]
     [TestCase(SupportedDatabase.OpenSearch)]
+    [Obsolete]
     public async Task SimilaritySearch_Ok(SupportedDatabase database)
     {
         await using var environment = await StartEnvironmentForAsync(database);
diff --git a/src/IntegrationTests/HistoryTests.Redis.cs b/src/IntegrationTests/HistoryTests.Redis.cs
index 0402be6..fe94caf 100644
--- a/src/IntegrationTests/HistoryTests.Redis.cs
+++ b/src/IntegrationTests/HistoryTests.Redis.cs
@@ -6,6 +6,7 @@ namespace LangChain.Databases.IntegrationTests;
 public partial class HistoryTests
 {
     [Test]
+    [Obsolete]
     public async Task Redis_Ttl_Ok()
     {
         await using var environment = await StartEnvironmentForAsync(SupportedDatabase.Redis);
diff --git a/src/IntegrationTests/HistoryTests.cs b/src/IntegrationTests/HistoryTests.cs
index 1039769..b26843e 100644
--- a/src/IntegrationTests/HistoryTests.cs
+++ b/src/IntegrationTests/HistoryTests.cs
@@ -8,6 +8,7 @@ public partial class HistoryTests
     [TestCase(SupportedDatabase.File)]
     [TestCase(SupportedDatabase.Mongo)]
     [TestCase(SupportedDatabase.Redis)]
+    [Obsolete]
     public async Task FillAndClear_Ok(SupportedDatabase database)
     {
         await using var environment = await StartEnvironmentForAsync(database);
diff --git a/src/Postgres/src/PostgresDbClient.cs b/src/Postgres/src/PostgresDbClient.cs
index 16fac7c..d2fa462 100644
--- a/src/Postgres/src/PostgresDbClient.cs
+++ b/src/Postgres/src/PostgresDbClient.cs
@@ -208,7 +208,7 @@ public async Task UpsertBatchAsync(
 
         await using (connection)
         {
-            await using var transaction = await connection.BeginTransactionAsync(cancellationToken).ConfigureAwait(false);
+            await using var transaction = (await connection.BeginTransactionAsync(cancellationToken).ConfigureAwait(false)).ConfigureAwait(false);
 
             try
             {