diff --git a/lifehacking/Tests/Application.Tests/Application.Tests.csproj b/lifehacking/Tests/Application.Tests/Application.Tests.csproj
index dff4e07..9db6a5c 100644
--- a/lifehacking/Tests/Application.Tests/Application.Tests.csproj
+++ b/lifehacking/Tests/Application.Tests/Application.Tests.csproj
@@ -14,7 +14,7 @@
 		<PackageReference Include="Moq" Version="4.20.72" />
 		<PackageReference Include="xunit" Version="2.9.3" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
-		<PackageReference Include="FluentAssertions" Version="6.12.2" />
+		<PackageReference Include="FluentAssertions" Version="8.9.0" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\..\Application\Application.csproj" />
diff --git a/lifehacking/Tests/Application.Tests/UseCases/Dashboard/GetDashboardUseCaseTests.cs b/lifehacking/Tests/Application.Tests/UseCases/Dashboard/GetDashboardUseCaseTests.cs
index 4cdc4e4..a97a318 100644
--- a/lifehacking/Tests/Application.Tests/UseCases/Dashboard/GetDashboardUseCaseTests.cs
+++ b/lifehacking/Tests/Application.Tests/UseCases/Dashboard/GetDashboardUseCaseTests.cs
@@ -97,23 +97,23 @@ public async Task ExecuteAsync_ShouldReturnDashboardStatistics_WhenDataExists()
 
         // Users assertions - verify totals and that new properties exist
         result.Value!.Users.Total.Should().Be(8);
-        result.Value.Users.ThisDay.Should().BeGreaterOrEqualTo(1);
-        result.Value.Users.LastDay.Should().BeGreaterOrEqualTo(0);
-        result.Value.Users.ThisWeek.Should().BeGreaterOrEqualTo(1);
-        result.Value.Users.LastWeek.Should().BeGreaterOrEqualTo(0);
-        result.Value.Users.ThisMonth.Should().BeGreaterOrEqualTo(1);
-        result.Value.Users.LastMonth.Should().BeGreaterOrEqualTo(0);
-        result.Value.Users.ThisYear.Should().BeGreaterOrEqualTo(1);
+        result.Value.Users.ThisDay.Should().BeGreaterThanOrEqualTo(1);
+        result.Value.Users.LastDay.Should().BeGreaterThanOrEqualTo(0);
+        result.Value.Users.ThisWeek.Should().BeGreaterThanOrEqualTo(1);
+        result.Value.Users.LastWeek.Should().BeGreaterThanOrEqualTo(0);
+        result.Value.Users.ThisMonth.Should().BeGreaterThanOrEqualTo(1);
+        result.Value.Users.LastMonth.Should().BeGreaterThanOrEqualTo(0);
+        result.Value.Users.ThisYear.Should().BeGreaterThanOrEqualTo(1);
         result.Value.Users.LastYear.Should().Be(1);
 
         // Categories assertions
         result.Value.Categories.Total.Should().Be(3);
-        result.Value.Categories.ThisMonth.Should().BeGreaterOrEqualTo(1);
+        result.Value.Categories.ThisMonth.Should().BeGreaterThanOrEqualTo(1);
 
         // Tips assertions
         result.Value.Tips.Total.Should().Be(5);
-        result.Value.Tips.ThisDay.Should().BeGreaterOrEqualTo(1);
-        result.Value.Tips.ThisMonth.Should().BeGreaterOrEqualTo(1);
+        result.Value.Tips.ThisDay.Should().BeGreaterThanOrEqualTo(1);
+        result.Value.Tips.ThisMonth.Should().BeGreaterThanOrEqualTo(1);
     }
 
     [Fact]
@@ -299,21 +299,21 @@ public async Task ExecuteAsync_ShouldIncludeAllTimePeriodsInResponse_WhenCalled(
         result.Value!.Users.Total.Should().Be(3);
 
         // Verify all time period properties are present and have valid values (>= 0)
-        result.Value.Users.ThisDay.Should().BeGreaterOrEqualTo(0);
-        result.Value.Users.LastDay.Should().BeGreaterOrEqualTo(0);
-        result.Value.Users.ThisWeek.Should().BeGreaterOrEqualTo(0);
-        result.Value.Users.LastWeek.Should().BeGreaterOrEqualTo(0);
-        result.Value.Users.ThisMonth.Should().BeGreaterOrEqualTo(0);
-        result.Value.Users.LastMonth.Should().BeGreaterOrEqualTo(0);
-        result.Value.Users.ThisYear.Should().BeGreaterOrEqualTo(0);
-        result.Value.Users.LastYear.Should().BeGreaterOrEqualTo(0);
+        result.Value.Users.ThisDay.Should().BeGreaterThanOrEqualTo(0);
+        result.Value.Users.LastDay.Should().BeGreaterThanOrEqualTo(0);
+        result.Value.Users.ThisWeek.Should().BeGreaterThanOrEqualTo(0);
+        result.Value.Users.LastWeek.Should().BeGreaterThanOrEqualTo(0);
+        result.Value.Users.ThisMonth.Should().BeGreaterThanOrEqualTo(0);
+        result.Value.Users.LastMonth.Should().BeGreaterThanOrEqualTo(0);
+        result.Value.Users.ThisYear.Should().BeGreaterThanOrEqualTo(0);
+        result.Value.Users.LastYear.Should().BeGreaterThanOrEqualTo(0);
 
         // Verify the sum of all periods doesn't exceed total
         var allPeriods = result.Value.Users.ThisDay + result.Value.Users.LastDay +
                         result.Value.Users.ThisWeek + result.Value.Users.LastWeek +
                         result.Value.Users.ThisMonth + result.Value.Users.LastMonth +
                         result.Value.Users.ThisYear + result.Value.Users.LastYear;
-        allPeriods.Should().BeGreaterOrEqualTo(0, "all period counts should be non-negative");
+        allPeriods.Should().BeGreaterThanOrEqualTo(0, "all period counts should be non-negative");
     }
 
     [Fact]
diff --git a/lifehacking/Tests/Application.Tests/Validation/FileValidationHelperTests.cs b/lifehacking/Tests/Application.Tests/Validation/FileValidationHelperTests.cs
index 5343647..b918b21 100644
--- a/lifehacking/Tests/Application.Tests/Validation/FileValidationHelperTests.cs
+++ b/lifehacking/Tests/Application.Tests/Validation/FileValidationHelperTests.cs
@@ -249,7 +249,7 @@ public void SanitizeFileName_ShouldTruncateToMaxLength_WhenFileNameIsTooLong()
         var result = FileValidationHelper.SanitizeFileName(longFileName);
 
         // Assert
-        result.Length.Should().BeLessOrEqualTo(255, "filename should be truncated to 255 characters");
+        result.Length.Should().BeLessThanOrEqualTo(255, "filename should be truncated to 255 characters");
     }
 
     [Fact]
@@ -263,7 +263,7 @@ public void SanitizeFileName_ShouldPreserveExtension_WhenTruncating()
 
         // Assert
         result.Should().EndWith(".jpg", "file extension should be preserved when truncating");
-        result.Length.Should().BeLessOrEqualTo(255);
+        result.Length.Should().BeLessThanOrEqualTo(255);
     }
 
     [Fact]