diff --git a/CS/DevExpressBunit.Test/DevExpressBunit.Test.csproj b/CS/DevExpressBunit.Test/DevExpressBunit.Test.csproj
index 368015a..c1518d7 100644
--- a/CS/DevExpressBunit.Test/DevExpressBunit.Test.csproj
+++ b/CS/DevExpressBunit.Test/DevExpressBunit.Test.csproj
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="bunit.web" Version="1.23.9" />
-    <PackageReference Include="Moq" Version="4.20.69" />
-    <PackageReference Include="FluentAssertions" Version="7.0.0-alpha.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23424-02" />
-    <PackageReference Include="xunit" Version="2.5.2-pre.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.2-pre.3">
+    <PackageReference Include="AngleSharp" Version="1.*" />
+    <PackageReference Include="bunit" Version="2.7.2" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="FluentAssertions" Version="8.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="10.0.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/CS/DevExpressBunit.Test/DevExpressComponentTest.cs b/CS/DevExpressBunit.Test/DevExpressComponentTest.cs
index 0f41eb6..3b05e62 100644
--- a/CS/DevExpressBunit.Test/DevExpressComponentTest.cs
+++ b/CS/DevExpressBunit.Test/DevExpressComponentTest.cs
@@ -17,7 +17,7 @@
 
 namespace DevExpressBunit.Test {
     public static class BUnitTestContextExtensions {
-        public static void AddDevExpressBlazorTesting(this TestContext testContext) {
+        public static void AddDevExpressBlazorTesting(this BunitContext testContext) {
             testContext.Services.AddSingleton<WeatherForecastService>();
             testContext.Services.TryAddScoped<ScriptsProvider, ScriptsProvider>();
             testContext.Services.TryAddScoped<LicenseRenderer, LicenseRenderer>();
@@ -32,11 +32,6 @@ public static void AddDevExpressBlazorTesting(this TestContext testContext) {
             testContext.JSInterop.ConfigureJSInterop();
         }
 
-        public static async Task WaitForAssertionAsync(this IRenderedFragmentBase renderedFragment, Action assertion, TimeSpan? timeout = null) {
-            using var waiter = new WaitForAssertionHelper(renderedFragment, assertion, timeout);
-            await waiter.WaitTask;
-        }
-
         static void ConfigureJSInterop(this BunitJSInterop interop) {
             interop.Mode = JSRuntimeMode.Loose;
             var rootModule = interop.SetupModule("./_content/DevExpress.Blazor/dx-blazor.js");
diff --git a/CS/DevExpressBunit.Test/GridApplyFilter.cs b/CS/DevExpressBunit.Test/GridApplyFilter.cs
index c3cd57e..e96e0f4 100644
--- a/CS/DevExpressBunit.Test/GridApplyFilter.cs
+++ b/CS/DevExpressBunit.Test/GridApplyFilter.cs
@@ -7,15 +7,15 @@
 
 namespace DevExpressBunit.Test {
     public class GridApplyFilter : IDisposable {
-        public TestContext Context { get; }
+        public BunitContext Context { get; }
         public GridApplyFilter() {
-            Context = new TestContext();
+            Context = new BunitContext();
             Context.Services.AddOptions();
             Context.AddDevExpressBlazorTesting();
         }
         [Fact]
         public void CheckIfNodeClickAppliesFilter() {
-            var cut = Context.RenderComponent<Grid_ApplyFilter>();
+            var cut = Context.Render<Grid_ApplyFilter>();
             var treeview = cut.FindComponent<DxTreeView>().Instance;
             var grid = cut.FindComponent<DxGrid>().Instance;
             cut.InvokeAsync(() => treeview.SelectNode(x => x.Text == "Filter by date"));
diff --git a/CS/DxTestProject/DxTestProject.csproj b/CS/DxTestProject/DxTestProject.csproj
index 2fb84f4..62e49e9 100644
--- a/CS/DxTestProject/DxTestProject.csproj
+++ b/CS/DxTestProject/DxTestProject.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>disable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>