diff --git a/Directory.Packages.props b/Directory.Packages.props
index 796af21c..2b9853e8 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -37,8 +37,7 @@
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
     <PackageVersion Include="RavenDB.TestDriver" Version="7.0.0" />
     <PackageVersion Include="Shouldly" Version="4.3.0" />
-    <PackageVersion Include="bunit" Version="2.0.24-preview" />
-    <PackageVersion Include="bunit.generators" Version="2.0.24-preview" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <PackageVersion Include="bunit" Version="2.0.36-preview" />
     <PackageVersion Include="coverlet.collector" Version="6.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index cc169fd2..98b8803f 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -16,7 +16,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="bunit.generators" />
     <PackageReference Include="bunit" />
     <PackageReference Include="Shouldly" />
     <PackageReference Include="NSubstitute" />
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/CreateNewBlogPostPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/CreateNewBlogPostPageTests.cs
index 28d6a55e..bb33eaea 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/CreateNewBlogPostPageTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/CreateNewBlogPostPageTests.cs
@@ -49,7 +49,7 @@ public async Task ShouldSaveBlogPostOnSave()
         instantRegistry.Received(1).RunInstantJob<SimilarBlogPostJob>(Arg.Any<object>(), Arg.Any<CancellationToken>());
     }
 
-    private static void TriggerNewBlogPost(RenderedComponent<CreateNewBlogPost> cut)
+    private static void TriggerNewBlogPost(IRenderedComponent<CreateNewBlogPost> cut)
     {
         cut.Find("#title").Input("My Title");
         cut.Find("#short").Input("My short Description");
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/UpdateBlogPostPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/UpdateBlogPostPageTests.cs
index e6369e35..c52b9ff5 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/UpdateBlogPostPageTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/UpdateBlogPostPageTests.cs
@@ -12,6 +12,7 @@
 using LinkDotNet.Blog.Web.Features.Admin.BlogPostEditor.Components;
 using LinkDotNet.Blog.Web.Features.Components;
 using LinkDotNet.Blog.Web.Features.Services;
+using Microsoft.AspNetCore.Components;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using NCronJob;
@@ -68,7 +69,7 @@ public void ShouldThrowWhenNoIdProvided()
         act.ShouldThrow<ArgumentNullException>();
     }
 
-    private static void TriggerUpdate(RenderedFragment cut)
+    private static void TriggerUpdate(IRenderedComponent<IComponent> cut)
     {
         cut.Find("#short").Input("My new Description");
 
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/ProfileTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/ProfileTests.cs
index 881ce51c..34423367 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/ProfileTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/ProfileTests.cs
@@ -177,10 +177,10 @@ private static void SetupGetAll(
         return (repoMock, calcMock);
     }
 
-    private RenderedComponent<Profile> RenderProfileWithEmptyInformation()
+    private IRenderedComponent<Profile> RenderProfileWithEmptyInformation()
         => Render<Profile>(p => p.Add(s => s.ProfileInformation, new ProfileInformationBuilder().Build()));
 
-    private RenderedComponent<Profile> RenderProfileInAdmin()
+    private IRenderedComponent<Profile> RenderProfileInAdmin()
         => Render<Profile>(p => p
             .Add(s => s.ProfileInformation, new ProfileInformationBuilder().Build())
             .Add(s => s.ShowAdminActions, true));
diff --git a/tests/LinkDotNet.Blog.TestUtilities/BunitExtensions.cs b/tests/LinkDotNet.Blog.TestUtilities/BunitExtensions.cs
index 719a3bc7..e8a1c433 100644
--- a/tests/LinkDotNet.Blog.TestUtilities/BunitExtensions.cs
+++ b/tests/LinkDotNet.Blog.TestUtilities/BunitExtensions.cs
@@ -5,14 +5,14 @@ namespace LinkDotNet.Blog.TestUtilities;
 
 public static class BunitExtensions
 {
-    public static RenderedComponent<TComponent> WaitForComponent<TComponent>(this RenderedFragment component) 
+    public static IRenderedComponent<TComponent> WaitForComponent<TComponent>(this IRenderedComponent<IComponent> component) 
         where TComponent : IComponent
     {
         component.WaitForState(component.HasComponent<TComponent>);
         return component.FindComponent<TComponent>();
     }
     
-    public static IReadOnlyList<RenderedComponent<TComponent>> WaitForComponents<TComponent>(this RenderedFragment component) 
+    public static IReadOnlyList<IRenderedComponent<TComponent>> WaitForComponents<TComponent>(this IRenderedComponent<IComponent> component) 
         where TComponent : IComponent
     {
         component.WaitForState(component.HasComponent<TComponent>);
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/OgDataTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/OgDataTests.cs
index 3dcdf572..54854b24 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/OgDataTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/OgDataTests.cs
@@ -70,7 +70,7 @@ public void ShouldSetCanoncialLinkWithoutQueryParameter()
     }
 
     private static void AssertMetaTagExistsWithValue(
-        RenderedFragment cut,
+        IRenderedComponent<IComponent> cut,
         string metaTag,
         string metaTagValue,
         string? ogPropertyName = null)
@@ -87,7 +87,7 @@ private static void AssertMetaTagExistsWithValue(
     }
 
     private static bool GetMetaTagExists(
-        RenderedFragment cut,
+        IRenderedComponent<IComponent> cut,
         string metaTag)
     {
         var metaTags = cut.FindAll("meta");