diff --git a/src/Model2Entities/ActivityRepository.cs b/src/Model2Entities/ActivityRepository.cs
index d9db52b..0d4ac1f 100644
--- a/src/Model2Entities/ActivityRepository.cs
+++ b/src/Model2Entities/ActivityRepository.cs
@@ -89,11 +89,14 @@ public partial class DbDataManager : IDataManager
                                 entity.AverageTemperature = activity.AverageTemperature;
                                 entity.HasAutoPause = activity.HasAutoPause;
                             });
-                if (updatedActivity != null)
+                if (updatedActivity != null) {
                     _logger.LogInformation($"Updated activity with ID {id}");
-                else
+                    return await Task.FromResult(updatedActivity!.ToModel());
+                }
+                else {
                     _logger.LogError($"Failed to update activity with ID {id}");
-                return await Task.FromResult(updatedActivity!.ToModel());
+                    return null;
+                }
             }
             catch (Exception ex)
             {
diff --git a/src/Model2Entities/DbDataManager.cs b/src/Model2Entities/DbDataManager.cs
index 6384b43..912305a 100644
--- a/src/Model2Entities/DbDataManager.cs
+++ b/src/Model2Entities/DbDataManager.cs
@@ -27,7 +27,8 @@ public partial class DbDataManager: IDataManager
     public DbDataManager(string dbPlatformPath)
         : this(new HeartTrackContext(dbPlatformPath))
     {
-        Console.WriteLine($"Database created String: {DbContext.Database.EnsureCreated()}");    }
+        Console.WriteLine($"Database created String: {DbContext.Database.EnsureCreated()}");    
+    }
 
 
     public DbDataManager()
diff --git a/src/Model2Entities/Extension.cs b/src/Model2Entities/Extension.cs
index d1acce2..3cde249 100644
--- a/src/Model2Entities/Extension.cs
+++ b/src/Model2Entities/Extension.cs
@@ -14,7 +14,13 @@ public static class Extensions
             return await Task.FromResult<T?>(null);
         }
         var entry = context.Set<T>().Add(item);
-        await context.SaveChangesAsync();
+        try {
+            await context.SaveChangesAsync();
+        } 
+        catch (Exception ex)
+        {
+            Console.WriteLine(ex.Message, ex.InnerException, ex.StackTrace);
+        }
 
         return await Task.FromResult<T?>(entry.Entity);
     }
@@ -68,9 +74,9 @@ public static class Extensions
 
             // Enregistrer les modifications dans la base de données
             await context.SaveChangesAsync();
+            return existingT;
         }
-
-        return existingT;
+        return default(U);
     }
 
     
diff --git a/src/Tests/ConsoleTestEFMapper/Program.cs b/src/Tests/ConsoleTestEFMapper/Program.cs
index fcf59ac..ed539b6 100644
--- a/src/Tests/ConsoleTestEFMapper/Program.cs
+++ b/src/Tests/ConsoleTestEFMapper/Program.cs
@@ -30,7 +30,7 @@ namespace Model2Entities
 
             // Test de la méthode GetActivityByIdAsync
             Console.WriteLine("Testing GetActivityByIdAsync method...");
-            var activityById = await activityRepository.GetActivityByIdAsync(2);
+            var activityById = await activityRepository.GetActivityByIdAsync(3);
             if (activityById != null)
             {
                 Console.WriteLine($"Activity found: ID: {activityById.Id}, Name: {activityById.Type}, Date: {activityById.Date}, Start Time: {activityById.StartTime}, End Time: {activityById.EndTime}");
@@ -42,35 +42,35 @@ namespace Model2Entities
             Console.WriteLine();
 
             // // Test de la méthode AddActivity
-            Console.WriteLine("Testing AddActivity method...");
-            var newActivity = new Activity(10, "New Activity", new DateTime(2021, 10, 10), new DateTime(10, 10, 10, 10, 10, 10), new DateTime(10, 10, 10, 12, 12, 12), 5, 5, 5, 5, 5, 5, 5, 5, false);
-            var addedActivity = await activityRepository.AddActivity(newActivity);
-            if (addedActivity != null)
-            {
-                Console.WriteLine($"New activity added successfully: ID: {addedActivity.Id}, Name: {addedActivity.Type}, Date: {addedActivity.Date}, Start Time: {addedActivity.StartTime}, End Time: {addedActivity.EndTime}");
-            }
-            else
-            {
-                Console.WriteLine("Failed to add new activity.");
-            }
-            Console.WriteLine();
-
-            // // Test de la méthode UpdateActivity
-            // Console.WriteLine("Testing UpdateActivity method...");
-            // var updatedActivity = await activityRepository.UpdateActivity(6, new Activity { Id = 6, Name = "Updated Activity" });
-            // if (updatedActivity != null)
+            // Console.WriteLine("Testing AddActivity method...");
+            // var newActivity = new Activity(10, "New Activity", new DateTime(2021, 10, 10), new DateTime(10, 10, 10, 10, 10, 10), new DateTime(10, 10, 10, 12, 12, 12), 5, 5, 5, 5, 5, 5, 5, 5, false);
+            // var addedActivity = await activityRepository.AddActivity(newActivity);
+            // if (addedActivity != null)
             // {
-            //     Console.WriteLine($"Activity updated successfully: ID: {updatedActivity.Id}, Name: {updatedActivity.Name}");
+            //     Console.WriteLine($"New activity added successfully: ID: {addedActivity.Id}, Name: {addedActivity.Type}, Date: {addedActivity.Date}, Start Time: {addedActivity.StartTime}, End Time: {addedActivity.EndTime}");
             // }
             // else
             // {
-            //     Console.WriteLine("Failed to update activity.");
+            //     Console.WriteLine("Failed to add new activity.");
             // }
             // Console.WriteLine();
 
+            // Test de la méthode UpdateActivity
+            Console.WriteLine("Testing UpdateActivity method...");
+            var updatedActivity = await activityRepository.UpdateActivity(10, new Activity(10, "Updated Activity", new DateTime(2021, 10, 10), new DateTime(10, 10, 10, 10, 10, 10), new DateTime(10, 10, 10, 12, 12, 12), 5, 5, 5, 5, 5, 5, 5, 5, false));
+            if (updatedActivity != null)
+            {
+                Console.WriteLine($"Activity updated successfully: ID: {updatedActivity.Id}, Name: {updatedActivity.Type}, Date: {updatedActivity.Date}, Start Time: {updatedActivity.StartTime}, End Time: {updatedActivity.EndTime}");
+            }
+            else
+            {
+                Console.WriteLine("Failed to update activity.");
+            }
+            Console.WriteLine();
+
             // Test de la méthode DeleteActivity
             Console.WriteLine("Testing DeleteActivity method...");
-            var isDeleted = await activityRepository.DeleteActivity(1);
+            var isDeleted = await activityRepository.DeleteActivity(2);
             if (isDeleted)
             {
                 Console.WriteLine("Activity deleted successfully.");
@@ -78,6 +78,7 @@ namespace Model2Entities
             {
                 Console.WriteLine("Failed to delete activity.");
             }
+            Console.WriteLine();
 
             // Test de la méthode GetNbItems
             Console.WriteLine("Testing GetNbItems method...");
diff --git a/src/Tests/ConsoleTestEFMapper/uca.HeartTrack.db-shm b/src/Tests/ConsoleTestEFMapper/uca.HeartTrack.db-shm
deleted file mode 100644
index fe9ac28..0000000
Binary files a/src/Tests/ConsoleTestEFMapper/uca.HeartTrack.db-shm and /dev/null differ
diff --git a/src/Tests/ConsoleTestEFMapper/uca.HeartTrack.db-wal b/src/Tests/ConsoleTestEFMapper/uca.HeartTrack.db-wal
deleted file mode 100644
index e69de29..0000000