diff --git a/backend/global.json b/backend/global.json
index 9aaf275..ed07ad8 100644
--- a/backend/global.json
+++ b/backend/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
     "version": "10.0.103",
-    "rollForward": "latestPatch"
+    "rollForward": "latestFeature"
   }
-}
\ No newline at end of file
+}
diff --git a/backend/tests/RentACar.Tests/RentACar.Tests.csproj b/backend/tests/RentACar.Tests/RentACar.Tests.csproj
index 37a108f..195602f 100644
--- a/backend/tests/RentACar.Tests/RentACar.Tests.csproj
+++ b/backend/tests/RentACar.Tests/RentACar.Tests.csproj
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MockQueryable.EntityFrameworkCore" Version="7.0.0" />
-    <PackageReference Include="MockQueryable.Moq" Version="7.0.0" />
+    <PackageReference Include="MockQueryable.EntityFrameworkCore" Version="10.0.2" />
+    <PackageReference Include="MockQueryable.Moq" Version="10.0.2" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/backend/tests/RentACar.Tests/Unit/Services/ReservationServiceTests.cs b/backend/tests/RentACar.Tests/Unit/Services/ReservationServiceTests.cs
index 4ca8ec8..a620f2a 100644
--- a/backend/tests/RentACar.Tests/Unit/Services/ReservationServiceTests.cs
+++ b/backend/tests/RentACar.Tests/Unit/Services/ReservationServiceTests.cs
@@ -288,7 +288,7 @@ public async Task CreateDraftReservationAsync_WhenVehicleGroupAvailable_CreatesR
 
         // Setup customer repository mock - no existing customer
         _customerRepositoryMock.Setup(x => x.GetQueryable())
-            .Returns(new List<Customer>().AsQueryable().BuildMock());
+            .Returns(new List<Customer>().BuildMockDbSet().Object);
 
         // Act
         var result = await _sut.CreateDraftReservationAsync(request, CancellationToken.None);
@@ -346,7 +346,7 @@ public async Task CreateHoldAsync_WhenDraftReservationHasGroup_AssignsVehicleAnd
 
         _vehicleRepositoryMock
             .Setup(x => x.GetQueryable())
-            .Returns(new List<Vehicle> { availableVehicle }.AsQueryable().BuildMock());
+            .Returns(new List<Vehicle> { availableVehicle }.BuildMockDbSet().Object);
 
         _reservationRepositoryMock
             .Setup(x => x.HasOverlappingReservationsAsync(
@@ -698,3 +698,5 @@ private void VerifyLogDoesNotContain(string forbiddenText, string requiredPrefix
         }
     };
 }
+
+