diff --git a/src/Tests/UnitTestsEntities/ActivityEntityTests.cs b/src/Tests/UnitTestsEntities/ActivityEntityTests.cs
index de6cedf..ed9c7f0 100644
--- a/src/Tests/UnitTestsEntities/ActivityEntityTests.cs
+++ b/src/Tests/UnitTestsEntities/ActivityEntityTests.cs
@@ -77,14 +77,14 @@ public class ActivityEntityTests (DatabaseFixture fixture) : IClassFixture<Datab
 
         using (var context = new TrainingStubbedContext(fixture._options))
         {
-            var savedActivity = context.ActivitiesSet.First(a => a.Type == "Running");
+            var savedActivity = context.ActivitiesSet.FirstOrDefault(a => a.Type == "Running" && a.Maximum == 200);
             savedActivity.Type = "Walking";
             context.SaveChanges();
         }
 
         using (var context = new TrainingStubbedContext(fixture._options))
         {
-            var updatedActivity = context.ActivitiesSet.First(a => a.Type == "Walking");
+            var updatedActivity = context.ActivitiesSet.First(a => a.Type == "Walking" && a.Maximum == 200);
             Assert.NotNull(updatedActivity);
             Assert.Equal("Walking", updatedActivity.Type );
             Assert.Equal(7, updatedActivity.EffortFelt );
@@ -123,14 +123,14 @@ public class ActivityEntityTests (DatabaseFixture fixture) : IClassFixture<Datab
 
         using (var context = new TrainingStubbedContext(fixture._options))
         {
-            var savedActivity = context.ActivitiesSet.First(a => a.Type == "Running");
+            var savedActivity = context.ActivitiesSet.FirstOrDefault(a => a.Type == "Running" && a.EffortFelt == 7);
             context.ActivitiesSet.Remove(savedActivity);
             context.SaveChanges();
         }
 
         using (var context = new TrainingStubbedContext(fixture._options))
         {
-            var deletedActivity = context.ActivitiesSet.FirstOrDefault(a => a.Type == "Running");
+            var deletedActivity = context.ActivitiesSet.FirstOrDefault(a => a.Type == "Running" && a.EffortFelt == 7);
             Assert.Null(deletedActivity);
         }
     }
diff --git a/src/Tests/UnitTestsEntities/DataSourceEntityTests.cs b/src/Tests/UnitTestsEntities/DataSourceEntityTests.cs
index 83c7bc1..1e0d1e0 100644
--- a/src/Tests/UnitTestsEntities/DataSourceEntityTests.cs
+++ b/src/Tests/UnitTestsEntities/DataSourceEntityTests.cs
@@ -84,14 +84,14 @@ public class DataSourceEntityTests (DatabaseFixture fixture) : IClassFixture<Dat
 
         using (var context = new TrainingStubbedContext(fixture._options))
         {
-            var savedDataSource = context.DataSourcesSet.First(d => d.Type == "Smartwatch");
+            var savedDataSource = context.DataSourcesSet.First(d => d.Type == "Smartwatch" && d.Model == "Apple Watch Series 6");
             context.DataSourcesSet.Remove(savedDataSource);
             context.SaveChanges();
         }
 
         using (var context = new TrainingStubbedContext(fixture._options))
         {
-            var deletedDataSource = context.DataSourcesSet.FirstOrDefault(d => d.Type == "Smartwatch");
+            var deletedDataSource = context.DataSourcesSet.FirstOrDefault(d => d.Type == "Smartwatch" && d.Model == "Apple Watch Series 6");
             Assert.Null(deletedDataSource);
         }
     }
diff --git a/src/Tests/UnitTestsEntities/FriendshipEntityTests.cs b/src/Tests/UnitTestsEntities/FriendshipEntityTests.cs
index 3e5d472..8e2b815 100644
--- a/src/Tests/UnitTestsEntities/FriendshipEntityTests.cs
+++ b/src/Tests/UnitTestsEntities/FriendshipEntityTests.cs
@@ -12,7 +12,7 @@ public class FriendshipEntityTests (DatabaseFixture fixture) : IClassFixture<Dat
     {
         var follower = new AthleteEntity
         {
-            Username = "follower_user",
+            Username = "follower_user1",
             LastName = "Follower",
             FirstName = "User",
             Email = "follower.user@example.com",
@@ -26,7 +26,7 @@ public class FriendshipEntityTests (DatabaseFixture fixture) : IClassFixture<Dat
 
         var following = new AthleteEntity
         {
-            Username = "following_user",
+            Username = "following_user1",
             LastName = "Following",
             FirstName = "User",
             Email = "following.user@example.com",
@@ -35,7 +35,8 @@ public class FriendshipEntityTests (DatabaseFixture fixture) : IClassFixture<Dat
             Weight = 60.0f,
             Password = "followingpassword",
             DateOfBirth = new DateOnly(1995, 5, 10),
-            IsCoach = false
+            IsCoach = false,
+            Followers = (ICollection<FriendshipEntity>)follower
         };
 
         var friendship = new FriendshipEntity
@@ -43,24 +44,25 @@ public class FriendshipEntityTests (DatabaseFixture fixture) : IClassFixture<Dat
             Follower = follower,
             Following = following,
             StartDate = DateTime.Now
-        };/*
-
+        };
+        //Cast impossible entre Entities.AthleteEntity & System.Collections.Generic.ICollection ; Idem pour Update et Delete mais pas modif vu que ca ne fonctionne pas 
         using (var context = new TrainingStubbedContext(fixture._options))
         {
             context.Database.EnsureCreated();
             context.AthletesSet.Add(follower);
             context.AthletesSet.Add(following);
-            context.Friendships.Add(friendship);
+            var follow = context.AthletesSet.FirstOrDefault(a => a.Username == "following_user1");
+            follow.Followings = (ICollection<FriendshipEntity>)following;
             context.SaveChanges();
         }
 
         using (var context = new TrainingStubbedContext(fixture._options))
         {
-            var savedFriendship = context.Friendships.FirstOrDefault();
-            Assert.NotNull(savedFriendship);
-            Assert.Equal(follower.IdAthlete, savedFriendship.FollowerId);
-            Assert.Equal(following.IdAthlete, savedFriendship.FollowingId);
-        }*/
+            var savedAth1 = context.AthletesSet.FirstOrDefault(a => a.Username == "following_user1");
+            var savedAth2 = context.AthletesSet.FirstOrDefault(a => a.Username == "follower_user1");
+            Assert.Equal(savedAth2, friendship.Follower);
+            Assert.Equal(savedAth1, friendship.Following);
+        }
     }
 
     [Fact]
diff --git a/src/Tests/UnitTestsEntities/HeartRateEntityTests.cs b/src/Tests/UnitTestsEntities/HeartRateEntityTests.cs
index 0755f02..377d960 100644
--- a/src/Tests/UnitTestsEntities/HeartRateEntityTests.cs
+++ b/src/Tests/UnitTestsEntities/HeartRateEntityTests.cs
@@ -51,7 +51,7 @@ public class HeartRateEntityTests (DatabaseFixture fixture) : IClassFixture<Data
 
         using (var context = new TrainingStubbedContext(fixture._options))
         {
-            var savedHeartRate = context.HeartRatesSet.First();
+            var savedHeartRate = context.HeartRatesSet.FirstOrDefault(h => h.Altitude == 100.0 && h.Temperature == 20.0f);
             Assert.NotNull(savedHeartRate);
             Assert.Equal(150, savedHeartRate.Bpm);
         }
@@ -118,7 +118,7 @@ public class HeartRateEntityTests (DatabaseFixture fixture) : IClassFixture<Data
     {
         var activity = new ActivityEntity
         {
-            Type = "Running",
+            Type = "Run",
             Date = new DateOnly(2024, 3, 15),
             StartTime = new TimeOnly(9, 0),
             EndTime = new TimeOnly(10, 0),
@@ -137,7 +137,7 @@ public class HeartRateEntityTests (DatabaseFixture fixture) : IClassFixture<Data
 
         var heartRateEntry = new HeartRateEntity
         {
-            Altitude = 100.0,
+            Altitude = 105.0,
             Time = new TimeOnly(9, 30),
             Temperature = 20.0f,
             Bpm = 150,
@@ -153,17 +153,19 @@ public class HeartRateEntityTests (DatabaseFixture fixture) : IClassFixture<Data
             context.HeartRatesSet.Add(heartRateEntry);
             context.SaveChanges();
         }
-
+        // Ne veut pas passer, si quelqu'un sait pourquoi ... Erreur : System.ArgumentNullException : Value cannot be null. (Parameter 'entity')
         using (var context = new TrainingStubbedContext(fixture._options))
         {
-            var savedHeartRate = context.HeartRatesSet.First();
+            var savedHeartRate = context.HeartRatesSet.FirstOrDefault(h => h.Altitude == 105.0);
+            var savedActivity = context.ActivitiesSet.FirstOrDefault(a => a.Type == "Run" && a.EffortFelt == 7 && a.Average == 0.4f);
             context.HeartRatesSet.Remove(savedHeartRate);
+            context.ActivitiesSet.Remove(savedActivity);
             context.SaveChanges();
         }
 
         using (var context = new TrainingStubbedContext(fixture._options))
         {
-            var deletedHeartRate = context.HeartRatesSet.FirstOrDefault();
+            var deletedHeartRate = context.HeartRatesSet.FirstOrDefault(h => h.Altitude == 105.0);
             Assert.Null(deletedHeartRate);
         }
     }
diff --git a/src/Tests/UnitTestsEntities/NotificationEntityTests.cs b/src/Tests/UnitTestsEntities/NotificationEntityTests.cs
index 7a1504e..1fbc3a6 100644
--- a/src/Tests/UnitTestsEntities/NotificationEntityTests.cs
+++ b/src/Tests/UnitTestsEntities/NotificationEntityTests.cs
@@ -43,7 +43,7 @@ public class NotificationEntityTests (DatabaseFixture fixture) : IClassFixture<D
 
         using (var context = new TrainingStubbedContext(fixture._options))
         {
-            var savedNotification = context.NotificationsSet.First();
+            var savedNotification = context.NotificationsSet.FirstOrDefault(n => n.Message == "Test notification" && n.Statut == false && n.Urgence == "High");
             Assert.NotNull(savedNotification);
             Assert.Equal("Test notification", savedNotification.Message);
         }
@@ -117,7 +117,7 @@ public class NotificationEntityTests (DatabaseFixture fixture) : IClassFixture<D
 
         var notification = new NotificationEntity
         {
-            Message = "Test notification",
+            Message = "Test notification Suppression",
             Date = DateTime.Now,
             Statut = false,
             Urgence = "High",
@@ -134,14 +134,14 @@ public class NotificationEntityTests (DatabaseFixture fixture) : IClassFixture<D
 
         using (var context = new TrainingStubbedContext(fixture._options))
         {
-            var savedNotification = context.NotificationsSet.First();
+            var savedNotification = context.NotificationsSet.FirstOrDefault(n => n.Message == "Test notification Suppression");
             context.NotificationsSet.Remove(savedNotification);
             context.SaveChanges();
         }
 
         using (var context = new TrainingStubbedContext(fixture._options))
         {
-            var deletedNotification = context.NotificationsSet.FirstOrDefault();
+            var deletedNotification = context.NotificationsSet.FirstOrDefault(n => n.Message == "Test notification Suppression");
             Assert.Null(deletedNotification);
         }
     }
diff --git a/src/Tests/UnitTestsEntities/StatisticEntityTests.cs b/src/Tests/UnitTestsEntities/StatisticEntityTests.cs
index 61d2e18..d466d34 100644
--- a/src/Tests/UnitTestsEntities/StatisticEntityTests.cs
+++ b/src/Tests/UnitTestsEntities/StatisticEntityTests.cs
@@ -119,7 +119,7 @@ public class StatisticEntityTests (DatabaseFixture fixture) : IClassFixture<Data
 
         var statistic = new StatisticEntity
         {
-            Weight = 75.0f,
+            Weight = 85.0f,
             AverageHeartRate = 150.0,
             MaximumHeartRate = 180.0,
             AverageCaloriesBurned = 500.0,
@@ -137,14 +137,14 @@ public class StatisticEntityTests (DatabaseFixture fixture) : IClassFixture<Data
 
         using (var context = new TrainingStubbedContext(fixture._options))
         {
-            var savedStatistic = context.StatisticsSet.FirstOrDefault(s => s.Weight == 75.0 && s.AverageHeartRate == 150.0 && s.MaximumHeartRate == 180.0);
+            var savedStatistic = context.StatisticsSet.FirstOrDefault(s => s.Weight == 85.0 );
             context.StatisticsSet.Remove(savedStatistic);
             context.SaveChanges();
         }
 
         using (var context = new TrainingStubbedContext(fixture._options))
         {
-            var deletedStatistic = context.StatisticsSet.FirstOrDefault(s => s.Weight == 75.0 && s.AverageHeartRate == 150.0 && s.MaximumHeartRate == 180.0);
+            var deletedStatistic = context.StatisticsSet.FirstOrDefault(s => s.Weight == 85.0 );
             Assert.Null(deletedStatistic);
         }
     }
diff --git a/src/Tests/UnitTestsEntities/TrainingEntityTests.cs b/src/Tests/UnitTestsEntities/TrainingEntityTests.cs
index cd499f8..7503bed 100644
--- a/src/Tests/UnitTestsEntities/TrainingEntityTests.cs
+++ b/src/Tests/UnitTestsEntities/TrainingEntityTests.cs
@@ -41,7 +41,7 @@ public class TrainingEntityTests (DatabaseFixture fixture) : IClassFixture<Datab
         var training = new TrainingEntity
         {
             Date = new DateOnly(2024, 3, 15),
-            Description = "Training description",
+            Description = "Training Description",
             Latitude = 40.12345f,
             Longitude = -74.56789f,
             FeedBack = "Training feedback",
@@ -60,9 +60,9 @@ public class TrainingEntityTests (DatabaseFixture fixture) : IClassFixture<Datab
 
         using (var context = new TrainingStubbedContext(fixture._options))
         {
-            var savedTraining = context.TrainingsSet.First();
+            var savedTraining = context.TrainingsSet.FirstOrDefault(t => t.Description == "Training Description" && t.FeedBack == "Training feedback");
             Assert.NotNull(savedTraining);
-            Assert.Equal("Training description", savedTraining.Description);
+            Assert.Equal("Training Description", savedTraining.Description);
         }
     }
 
@@ -166,10 +166,10 @@ public class TrainingEntityTests (DatabaseFixture fixture) : IClassFixture<Datab
         var training = new TrainingEntity
         {
             Date = new DateOnly(2024, 3, 15),
-            Description = "Training description",
+            Description = "Training description suppression",
             Latitude = 40.12345f,
             Longitude = -74.56789f,
-            FeedBack = "Training feedback",
+            FeedBack = "Training feedback suppression",
             Coach = coach,
             Athletes = { athlete }
         };
@@ -185,14 +185,14 @@ public class TrainingEntityTests (DatabaseFixture fixture) : IClassFixture<Datab
 
         using (var context = new TrainingStubbedContext(fixture._options))
         {
-            var savedTraining = context.TrainingsSet.First();
+            var savedTraining = context.TrainingsSet.FirstOrDefault(t => t.Description == "Training description suppression" && t.FeedBack == "Training feedback suppression");
             context.TrainingsSet.Remove(savedTraining);
             context.SaveChanges();
         }
 
         using (var context = new TrainingStubbedContext(fixture._options))
         {
-            var deletedTraining = context.TrainingsSet.FirstOrDefault();
+            var deletedTraining = context.TrainingsSet.FirstOrDefault(t => t.Description == "Training description suppression" && t.FeedBack == "Training feedback suppression");
             Assert.Null(deletedTraining);
         }
     }