diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index a2ddd952..6caebd49 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="bunit.generators" Version="1.27.11-preview" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-    <PackageReference Include="bunit" Version="1.26.64" />
+    <PackageReference Include="bunit.generators" Version="2.0.22-preview" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <PackageReference Include="bunit" Version="2.0.22-preview" />
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NSubstitute" Version="5.1.0" />
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/AboutMe/Components/TalksTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/AboutMe/Components/TalksTests.cs
index ad83245a..056b5fc6 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/AboutMe/Components/TalksTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/AboutMe/Components/TalksTests.cs
@@ -10,7 +10,7 @@ namespace LinkDotNet.Blog.IntegrationTests.Web.Features.AboutMe.Components;
 
 public sealed class TalksTests : SqlDatabaseTestBase<Talk>, IDisposable
 {
-    private readonly TestContext ctx = new();
+    private readonly BunitContext ctx = new();
 
     public TalksTests()
     {
@@ -20,7 +20,7 @@ public TalksTests()
     [Fact]
     public void WhenAddingTalkThenDisplayedToUser()
     {
-        var cut = ctx.RenderComponent<Talks>(
+        var cut = ctx.Render<Talks>(
             p => p.Add(s => s.ShowAdminActions, true));
         cut.Find("#add-talk").Click();
         cut.Find("#talk-title").Change("title");
@@ -42,7 +42,7 @@ public async Task LoadEarlierSavedTalks()
         await Repository.StoreAsync(new TalkBuilder().Build());
         await Repository.StoreAsync(new TalkBuilder().Build());
 
-        var cut = ctx.RenderComponent<Talks>();
+        var cut = ctx.Render<Talks>();
 
         cut.WaitForComponents<TalkEntry>().Count.Should().Be(2);
     }
@@ -51,7 +51,7 @@ public async Task LoadEarlierSavedTalks()
     public async Task WhenUserClickDeleteButtonThenDeleted()
     {
         await Repository.StoreAsync(new TalkBuilder().Build());
-        var cut = ctx.RenderComponent<Talks>(
+        var cut = ctx.Render<Talks>(
             p => p.Add(s => s.ShowAdminActions, true));
 
         cut.WaitForComponent<TalkEntry>().Find("#talk-delete").Click();
@@ -67,7 +67,7 @@ public async Task TalksAreOrderFromNewestToLatest()
         await Repository.StoreAsync(new TalkBuilder().WithPublishedDate(new DateTime(2021, 1, 1)).Build());
         await Repository.StoreAsync(new TalkBuilder().WithPublishedDate(new DateTime(2022, 1, 1)).Build());
 
-        var cut = ctx.RenderComponent<Talks>(
+        var cut = ctx.Render<Talks>(
             p => p.Add(s => s.ShowAdminActions, true));
 
         var talks = cut.WaitForComponents<TalkEntry>();
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 fc297ba0..e2fa6244 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/CreateNewBlogPostPageTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/CreateNewBlogPostPageTests.cs
@@ -15,15 +15,15 @@ public class CreateNewBlogPostPageTests : SqlDatabaseTestBase<BlogPost>
     [Fact]
     public async Task ShouldSaveBlogPostOnSave()
     {
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         var toastService = Substitute.For<IToastService>();
         ctx.JSInterop.SetupVoid("hljs.highlightAll");
-        ctx.AddTestAuthorization().SetAuthorized("some username");
+        ctx.AddAuthorization().SetAuthorized("some username");
         ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => toastService);
         ctx.ComponentFactories.AddStub<UploadFile>();
         ctx.Services.AddScoped(_ => Substitute.For<IFileProcessor>());
-        using var cut = ctx.RenderComponent<CreateBlogPost>();
+        using var cut = ctx.Render<CreateBlogPost>();
         var newBlogPost = cut.FindComponent<CreateNewBlogPost>();
 
         TriggerNewBlogPost(newBlogPost);
@@ -37,14 +37,14 @@ public async Task ShouldSaveBlogPostOnSave()
     [Fact]
     public async Task ShouldSetContentFromFile()
     {
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         const string contentFromFile = "content";
         ctx.JSInterop.SetupVoid("hljs.highlightAll");
-        ctx.AddTestAuthorization().SetAuthorized("some username");
+        ctx.AddAuthorization().SetAuthorized("some username");
         ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => Substitute.For<IToastService>());
         var args = SetupUploadFile(contentFromFile, ctx);
-        var cut = ctx.RenderComponent<CreateNewBlogPost>();
+        var cut = ctx.Render<CreateNewBlogPost>();
         var uploadFile = cut.FindComponent<UploadFile>();
 
         await uploadFile.InvokeAsync(() => cut.FindComponent<InputFile>().Instance.OnChange.InvokeAsync(args));
@@ -52,7 +52,7 @@ public async Task ShouldSetContentFromFile()
         cut.Find("#content").TextContent.Should().Be(contentFromFile);
     }
 
-    private static void TriggerNewBlogPost(IRenderedComponent<CreateNewBlogPost> cut)
+    private static void TriggerNewBlogPost(RenderedComponent<CreateNewBlogPost> cut)
     {
         cut.Find("#title").Input("My Title");
         cut.Find("#short").Input("My short Description");
@@ -64,7 +64,7 @@ private static void TriggerNewBlogPost(IRenderedComponent<CreateNewBlogPost> cut
         cut.Find("form").Submit();
     }
 
-    private static InputFileChangeEventArgs SetupUploadFile(string contentFromFile, TestContext ctx)
+    private static InputFileChangeEventArgs SetupUploadFile(string contentFromFile, BunitContext ctx)
     {
         var file = Substitute.For<IBrowserFile>();
         var fileProcessor = Substitute.For<IFileProcessor>();
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 72850d7c..b2f55f2e 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/UpdateBlogPostPageTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/UpdateBlogPostPageTests.cs
@@ -15,16 +15,16 @@ public class UpdateBlogPostPageTests : SqlDatabaseTestBase<BlogPost>
     [Fact]
     public async Task ShouldSaveBlogPostOnSave()
     {
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         ctx.JSInterop.SetupVoid("hljs.highlightAll");
         var toastService = Substitute.For<IToastService>();
         var blogPost = new BlogPostBuilder().WithTitle("Title").WithShortDescription("Sub").Build();
         await Repository.StoreAsync(blogPost);
-        ctx.AddTestAuthorization().SetAuthorized("some username");
+        ctx.AddAuthorization().SetAuthorized("some username");
         ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => toastService);
         ctx.ComponentFactories.AddStub<UploadFile>();
-        using var cut = ctx.RenderComponent<UpdateBlogPostPage>(
+        using var cut = ctx.Render<UpdateBlogPostPage>(
             p => p.Add(s => s.BlogPostId, blogPost.Id));
         var newBlogPost = cut.FindComponent<CreateNewBlogPost>();
 
@@ -39,18 +39,18 @@ public async Task ShouldSaveBlogPostOnSave()
     [Fact]
     public void ShouldThrowWhenNoIdProvided()
     {
-        using var ctx = new TestContext();
-        ctx.AddTestAuthorization().SetAuthorized("some username");
+        using var ctx = new BunitContext();
+        ctx.AddAuthorization().SetAuthorized("some username");
         ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => Substitute.For<IToastService>());
 
-        Action act = () => ctx.RenderComponent<UpdateBlogPostPage>(
+        Action act = () => ctx.Render<UpdateBlogPostPage>(
             p => p.Add(s => s.BlogPostId, null));
 
         act.Should().ThrowExactly<ArgumentNullException>();
     }
 
-    private static void TriggerUpdate(IRenderedFragment cut)
+    private static void TriggerUpdate(RenderedFragment cut)
     {
         cut.Find("#short").Input("My new Description");
 
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/Dashboard/Components/VisitCountPerPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/Dashboard/Components/VisitCountPerPageTests.cs
index 0006cd13..0163ef43 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/Dashboard/Components/VisitCountPerPageTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/Dashboard/Components/VisitCountPerPageTests.cs
@@ -19,11 +19,11 @@ public async Task ShouldShowCounts()
     {
         var blogPost = new BlogPostBuilder().WithTitle("I was clicked").WithLikes(2).Build();
         await Repository.StoreAsync(blogPost);
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         RegisterRepositories(ctx);
         await SaveBlogPostArticleClicked(blogPost.Id, 10);
 
-        var cut = ctx.RenderComponent<VisitCountPerPage>();
+        var cut = ctx.Render<VisitCountPerPage>();
 
         var elements = cut.WaitForElements("td");
         elements.Count.Should().Be(3);
@@ -52,10 +52,10 @@ public async Task ShouldFilterByDate()
         { BlogPostId = blogPost1.Id, DateClicked = new DateOnly(2021, 1, 1), Clicks = 1 };
         await DbContext.BlogPostRecords.AddRangeAsync(clicked1, clicked2, clicked3, clicked4);
         await DbContext.SaveChangesAsync();
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         ctx.ComponentFactories.AddStub<DateRangeSelector>();
         RegisterRepositories(ctx);
-        var cut = ctx.RenderComponent<VisitCountPerPage>();
+        var cut = ctx.Render<VisitCountPerPage>();
         var filter = new Filter { StartDate = new DateOnly(2019, 1, 1), EndDate = new DateOnly(2020, 12, 31) };
 
         await cut.InvokeAsync(() => cut.FindComponent<DateRangeSelectorStub>().Instance.FilterChanged.InvokeAsync(filter));
@@ -84,16 +84,16 @@ public async Task ShouldShowTotalClickCount()
             { BlogPostId = blogPost2.Id, DateClicked = DateOnly.MinValue, Clicks = 1 };
         await DbContext.BlogPostRecords.AddRangeAsync(clicked1, clicked2, clicked3);
         await DbContext.SaveChangesAsync();
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         RegisterRepositories(ctx);
 
-        var cut = ctx.RenderComponent<VisitCountPerPage>();
+        var cut = ctx.Render<VisitCountPerPage>();
 
         cut.WaitForElement("td");
         cut.Find("#total-clicks").TextContent.Should().Be("4 clicks in total");
     }
 
-    private void RegisterRepositories(TestContextBase ctx)
+    private void RegisterRepositories(BunitContext ctx)
     {
         ctx.Services.AddScoped<IRepository<BlogPost>>(_ => new Repository<BlogPost>(DbContextFactory, Substitute.For<ILogger<Repository<BlogPost>>>()));
         ctx.Services.AddScoped<IRepository<BlogPostRecord>>(_ => new Repository<BlogPostRecord>(DbContextFactory, Substitute.For<ILogger<Repository<BlogPostRecord>>>()));
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/DraftBlogPost/DraftBlogPostPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/DraftBlogPost/DraftBlogPostPageTests.cs
index f526e5e1..3f610ad8 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/DraftBlogPost/DraftBlogPostPageTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/DraftBlogPost/DraftBlogPostPageTests.cs
@@ -17,10 +17,10 @@ public async Task ShouldOnlyShowPublishedPosts()
         var unpublishedPost = new BlogPostBuilder().WithTitle("Not published").IsPublished(false).Build();
         await Repository.StoreAsync(publishedPost);
         await Repository.StoreAsync(unpublishedPost);
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         ctx.JSInterop.Mode = JSRuntimeMode.Loose;
         ctx.Services.AddScoped(_ => Repository);
-        var cut = ctx.RenderComponent<DraftBlogPostPage>();
+        var cut = ctx.Render<DraftBlogPostPage>();
         cut.WaitForElement(".blog-card");
 
         var blogPosts = cut.FindComponents<ShortBlogPost>();
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Archive/ArchivePageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Archive/ArchivePageTests.cs
index 801264be..5c8c28a4 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Archive/ArchivePageTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Archive/ArchivePageTests.cs
@@ -18,13 +18,13 @@ public class ArchivePageTests : SqlDatabaseTestBase<BlogPost>
     [Fact]
     public async Task ShouldDisplayAllBlogPosts()
     {
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         ctx.Services.AddScoped(_ => Repository);
         await Repository.StoreAsync(CreateBlogPost(new DateTime(2021, 1, 1), "Blog Post 1"));
         await Repository.StoreAsync(CreateBlogPost(new DateTime(2021, 2, 1), "Blog Post 2"));
         await Repository.StoreAsync(CreateBlogPost(new DateTime(2022, 1, 1), "Blog Post 3"));
 
-        var cut = ctx.RenderComponent<ArchivePage>();
+        var cut = ctx.Render<ArchivePage>();
 
         cut.WaitForElements("h2");
         var yearHeader = cut.FindAll("h2");
@@ -41,14 +41,14 @@ public async Task ShouldDisplayAllBlogPosts()
     [Fact]
     public async Task ShouldOnlyShowPublishedBlogPosts()
     {
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         ctx.Services.AddScoped(_ => Repository);
         var publishedBlogPost = new BlogPostBuilder().WithUpdatedDate(new DateTime(2022, 1, 1)).IsPublished().Build();
         var unPublishedBlogPost = new BlogPostBuilder().WithUpdatedDate(new DateTime(2022, 1, 1)).IsPublished(false).Build();
         await Repository.StoreAsync(publishedBlogPost);
         await Repository.StoreAsync(unPublishedBlogPost);
 
-        var cut = ctx.RenderComponent<ArchivePage>();
+        var cut = ctx.Render<ArchivePage>();
 
         cut.WaitForElements("h2");
         cut.FindAll("h2").Should().HaveCount(1);
@@ -57,12 +57,12 @@ public async Task ShouldOnlyShowPublishedBlogPosts()
     [Fact]
     public async Task ShouldShowTotalAmountOfBlogPosts()
     {
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         ctx.Services.AddScoped(_ => Repository);
         await Repository.StoreAsync(CreateBlogPost(new DateTime(2021, 1, 1), "Blog Post 1"));
         await Repository.StoreAsync(CreateBlogPost(new DateTime(2021, 2, 1), "Blog Post 2"));
 
-        var cut = ctx.RenderComponent<ArchivePage>();
+        var cut = ctx.Render<ArchivePage>();
 
         cut.WaitForElements("h2");
         cut.Find("h3").TextContent.Should().Be("Archive (2 posts)");
@@ -71,10 +71,10 @@ public async Task ShouldShowTotalAmountOfBlogPosts()
     [Fact]
     public void ShouldShowLoading()
     {
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         ctx.Services.AddScoped<IRepository<BlogPost>>(_ => new SlowRepository());
 
-        var cut = ctx.RenderComponent<ArchivePage>();
+        var cut = ctx.Render<ArchivePage>();
 
         cut.FindComponents<Loading>().Count.Should().Be(1);
     }
@@ -82,10 +82,10 @@ public void ShouldShowLoading()
     [Fact]
     public void ShouldSetOgData()
     {
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         ctx.Services.AddScoped(_ => Repository);
 
-        var cut = ctx.RenderComponent<ArchivePage>();
+        var cut = ctx.Render<ArchivePage>();
 
         var ogData = cut.FindComponent<OgData>().Instance;
         ogData.Title.Should().Contain("Archive");
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Home/IndexTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Home/IndexTests.cs
index 54a19ebd..e6ceff65 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Home/IndexTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Home/IndexTests.cs
@@ -20,10 +20,10 @@ public async Task ShouldShowAllBlogPostsWithLatestOneFirst()
         var newestBlogPost = new BlogPostBuilder().WithTitle("New").Build();
         await Repository.StoreAsync(oldestBlogPost);
         await Repository.StoreAsync(newestBlogPost);
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         ctx.JSInterop.Mode = JSRuntimeMode.Loose;
         RegisterComponents(ctx);
-        var cut = ctx.RenderComponent<Index>();
+        var cut = ctx.Render<Index>();
         cut.WaitForElement(".blog-card");
 
         var blogPosts = cut.FindComponents<ShortBlogPost>();
@@ -40,10 +40,10 @@ public async Task ShouldOnlyShowPublishedPosts()
         var unpublishedPost = new BlogPostBuilder().WithTitle("Not published").IsPublished(false).Build();
         await Repository.StoreAsync(publishedPost);
         await Repository.StoreAsync(unpublishedPost);
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         ctx.JSInterop.Mode = JSRuntimeMode.Loose;
         RegisterComponents(ctx);
-        var cut = ctx.RenderComponent<Index>();
+        var cut = ctx.Render<Index>();
         cut.WaitForElement(".blog-card");
 
         var blogPosts = cut.FindComponents<ShortBlogPost>();
@@ -56,10 +56,10 @@ public async Task ShouldOnlyShowPublishedPosts()
     public async Task ShouldOnlyLoadTenEntities()
     {
         await CreatePublishedBlogPosts(11);
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         ctx.JSInterop.Mode = JSRuntimeMode.Loose;
         RegisterComponents(ctx);
-        var cut = ctx.RenderComponent<Index>();
+        var cut = ctx.Render<Index>();
         cut.WaitForElement(".blog-card");
 
         var blogPosts = cut.FindComponents<ShortBlogPost>();
@@ -71,11 +71,11 @@ public async Task ShouldOnlyLoadTenEntities()
     public async Task ShouldLoadOnlyItemsInPage()
     {
         await CreatePublishedBlogPosts(11);
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         ctx.JSInterop.Mode = JSRuntimeMode.Loose;
         RegisterComponents(ctx);
 
-        var cut = ctx.RenderComponent<Index>(
+        var cut = ctx.Render<Index>(
             p => p.Add(s => s.Page, 2));
 
         cut.WaitForElement(".blog-card");
@@ -92,10 +92,10 @@ public async Task ShouldLoadTags()
             .WithTags("C Sharp", "Tag2")
             .Build();
         await Repository.StoreAsync(publishedPost);
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         ctx.JSInterop.Mode = JSRuntimeMode.Loose;
         RegisterComponents(ctx);
-        var cut = ctx.RenderComponent<Index>();
+        var cut = ctx.Render<Index>();
         cut.WaitForElement(".blog-card");
 
         var tags = cut.FindComponent<ShortBlogPost>().FindAll(".goto-tag");
@@ -112,10 +112,10 @@ public async Task ShouldLoadTags()
     [InlineData("http://localhost/relative/url", "http://localhost/relative/url")]
     public void ShouldSetAbsoluteUriForOgData(string givenUri, string expectedUri)
     {
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         RegisterComponents(ctx, givenUri);
 
-        var cut = ctx.RenderComponent<Index>();
+        var cut = ctx.Render<Index>();
 
         cut.WaitForComponent<OgData>().Instance.AbsolutePreviewImageUrl.Should().Be(expectedUri);
     }
@@ -127,11 +127,11 @@ public void ShouldSetAbsoluteUriForOgData(string givenUri, string expectedUri)
     public async Task ShouldSetPageToFirstIfOutOfRange(int? page)
     {
         await CreatePublishedBlogPosts(11);
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         ctx.JSInterop.Mode = JSRuntimeMode.Loose;
         RegisterComponents(ctx);
 
-        var cut = ctx.RenderComponent<Index>(p => p.Add(
+        var cut = ctx.Render<Index>(p => p.Add(
             i => i.Page, page));
 
         cut.WaitForElement(".blog-card");
@@ -162,7 +162,7 @@ private async Task CreatePublishedBlogPosts(int amount)
         }
     }
 
-    private void RegisterComponents(TestContextBase ctx, string profilePictureUri = null)
+    private void RegisterComponents(BunitContext ctx, string profilePictureUri = null)
     {
         ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => Options.Create(CreateSampleAppConfiguration(profilePictureUri).ApplicationConfiguration));
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Search/SearchPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Search/SearchPageTests.cs
index d3171739..f6ff655a 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Search/SearchPageTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Search/SearchPageTests.cs
@@ -18,10 +18,10 @@ public async Task ShouldFindBlogPostWhenTitleMatches()
         var blogPost2 = new BlogPostBuilder().WithTitle("Title 2").Build();
         await Repository.StoreAsync(blogPost1);
         await Repository.StoreAsync(blogPost2);
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         RegisterServices(ctx);
 
-        var cut = ctx.RenderComponent<SearchPage>(p => p.Add(s => s.SearchTerm, "Title 1"));
+        var cut = ctx.Render<SearchPage>(p => p.Add(s => s.SearchTerm, "Title 1"));
 
         var blogPosts = cut.WaitForComponent<ShortBlogPost>();
         blogPosts.Find(".description h1").TextContent.Should().Be("Title 1");
@@ -34,10 +34,10 @@ public async Task ShouldFindBlogPostWhenTagMatches()
         var blogPost2 = new BlogPostBuilder().WithTitle("Title 2").WithTags("Dog").Build();
         await Repository.StoreAsync(blogPost1);
         await Repository.StoreAsync(blogPost2);
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         RegisterServices(ctx);
 
-        var cut = ctx.RenderComponent<SearchPage>(p => p.Add(s => s.SearchTerm, "Cat"));
+        var cut = ctx.Render<SearchPage>(p => p.Add(s => s.SearchTerm, "Cat"));
 
         var blogPost = cut.WaitForComponent<ShortBlogPost>();
         blogPost.Find(".description h1").TextContent.Should().Be("Title 1");
@@ -48,16 +48,16 @@ public async Task ShouldUnescapeQuery()
     {
         var blogPost1 = new BlogPostBuilder().WithTitle("Title 1").Build();
         await Repository.StoreAsync(blogPost1);
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         RegisterServices(ctx);
 
-        var cut = ctx.RenderComponent<SearchPage>(p => p.Add(s => s.SearchTerm, "Title%201"));
+        var cut = ctx.Render<SearchPage>(p => p.Add(s => s.SearchTerm, "Title%201"));
 
         var blogPosts = cut.WaitForComponent<ShortBlogPost>();
         blogPosts.Find(".description h1").TextContent.Should().Be("Title 1");
     }
 
-    private void RegisterServices(TestContext ctx)
+    private void RegisterServices(BunitContext ctx)
     {
         ctx.Services.AddScoped(_ => Repository);
     }
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/SearchByTag/SearchByTagPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/SearchByTag/SearchByTagPageTests.cs
index 12f9131e..7bd19058 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/SearchByTag/SearchByTagPageTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/SearchByTag/SearchByTagPageTests.cs
@@ -15,13 +15,13 @@ public class SearchByTagTests : SqlDatabaseTestBase<BlogPost>
     [Fact]
     public async Task ShouldOnlyDisplayTagsGivenByParameter()
     {
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         await AddBlogPostWithTagAsync("Tag 1");
         await AddBlogPostWithTagAsync("Tag 1");
         await AddBlogPostWithTagAsync("Tag 1", isPublished: false);
         await AddBlogPostWithTagAsync("Tag 2");
         RegisterServices(ctx);
-        var cut = ctx.RenderComponent<SearchByTagPage>(p => p.Add(s => s.Tag, "Tag 1"));
+        var cut = ctx.Render<SearchByTagPage>(p => p.Add(s => s.Tag, "Tag 1"));
         cut.WaitForElement(".blog-card");
 
         var tags = cut.FindAll(".blog-card");
@@ -32,10 +32,10 @@ public async Task ShouldOnlyDisplayTagsGivenByParameter()
     [Fact]
     public async Task ShouldHandleSpecialCharacters()
     {
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         await AddBlogPostWithTagAsync("C#");
         RegisterServices(ctx);
-        var cut = ctx.RenderComponent<SearchByTagPage>(p => p.Add(s => s.Tag, Uri.EscapeDataString("C#")));
+        var cut = ctx.Render<SearchByTagPage>(p => p.Add(s => s.Tag, Uri.EscapeDataString("C#")));
         cut.WaitForElement(".blog-card");
 
         var tags = cut.FindAll(".blog-card");
@@ -46,11 +46,11 @@ public async Task ShouldHandleSpecialCharacters()
     [Fact]
     public void ShouldSetTitleToTag()
     {
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         ctx.Services.AddScoped(_ => Repository);
         ctx.ComponentFactories.AddStub<PageTitle>();
 
-        var cut = ctx.RenderComponent<SearchByTagPage>(p => p.Add(s => s.Tag, "Tag"));
+        var cut = ctx.Render<SearchByTagPage>(p => p.Add(s => s.Tag, "Tag"));
 
         var pageTitleStub = cut.FindComponent<PageTitleStub>();
         var pageTitle = ctx.Render(pageTitleStub.Instance.ChildContent!);
@@ -64,7 +64,7 @@ private async Task AddBlogPostWithTagAsync(string tag, bool isPublished = true)
         await DbContext.SaveChangesAsync();
     }
 
-    private void RegisterServices(TestContext ctx)
+    private void RegisterServices(BunitContext ctx)
     {
         ctx.Services.AddScoped(_ => Repository);
     }
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/ShowBlogPost/ShowBlogPostPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/ShowBlogPost/ShowBlogPostPageTests.cs
index cd5f1aec..0bd38c2a 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/ShowBlogPost/ShowBlogPostPageTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/ShowBlogPost/ShowBlogPostPageTests.cs
@@ -21,14 +21,14 @@ public async Task ShouldAddLikeOnEvent()
     {
         var publishedPost = new BlogPostBuilder().WithLikes(2).IsPublished().Build();
         await Repository.StoreAsync(publishedPost);
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         ctx.JSInterop.Mode = JSRuntimeMode.Loose;
         RegisterComponents(ctx);
-        ctx.AddTestAuthorization().SetAuthorized("s");
-        var cut = ctx.RenderComponent<ShowBlogPostPage>(
+        ctx.AddAuthorization().SetAuthorized("s");
+        var cut = ctx.Render<ShowBlogPostPage>(
             p => p.Add(b => b.BlogPostId, publishedPost.Id));
         var likeComponent = cut.FindComponent<Like>();
-        likeComponent.SetParametersAndRender(c => c.Add(p => p.BlogPost, publishedPost));
+        likeComponent.Render(c => c.Add(p => p.BlogPost, publishedPost));
 
         likeComponent.Find("span").Click();
 
@@ -41,18 +41,18 @@ public async Task ShouldSubtractLikeOnEvent()
     {
         var publishedPost = new BlogPostBuilder().WithLikes(2).IsPublished().Build();
         await Repository.StoreAsync(publishedPost);
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         var localStorage = Substitute.For<ILocalStorageService>();
         var hasLikedStorage = $"hasLiked/{publishedPost.Id}";
         localStorage.ContainKeyAsync(hasLikedStorage).Returns(true);
         localStorage.GetItemAsync<bool>(hasLikedStorage).Returns(true);
         ctx.JSInterop.Mode = JSRuntimeMode.Loose;
         RegisterComponents(ctx, localStorage);
-        ctx.AddTestAuthorization().SetAuthorized("s");
-        var cut = ctx.RenderComponent<ShowBlogPostPage>(
+        ctx.AddAuthorization().SetAuthorized("s");
+        var cut = ctx.Render<ShowBlogPostPage>(
             p => p.Add(b => b.BlogPostId, publishedPost.Id));
         var likeComponent = cut.FindComponent<Like>();
-        likeComponent.SetParametersAndRender(c => c.Add(p => p.BlogPost, publishedPost));
+        likeComponent.Render(c => c.Add(p => p.BlogPost, publishedPost));
 
         likeComponent.Find("span").Click();
 
@@ -65,11 +65,11 @@ public async Task ShouldSetTagsWhenAvailable()
     {
         var publishedPost = new BlogPostBuilder().IsPublished().WithTags("Tag1,Tag2").Build();
         await Repository.StoreAsync(publishedPost);
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         ctx.JSInterop.Mode = JSRuntimeMode.Loose;
-        ctx.AddTestAuthorization();
+        ctx.AddAuthorization();
         RegisterComponents(ctx);
-        var cut = ctx.RenderComponent<ShowBlogPostPage>(
+        var cut = ctx.Render<ShowBlogPostPage>(
             p => p.Add(b => b.BlogPostId, publishedPost.Id));
 
         var ogData = cut.FindComponent<OgData>();
@@ -86,12 +86,12 @@ public async Task ShouldSetStructuredData()
             .WithPreviewImageUrlFallback("image2")
             .Build();
         await Repository.StoreAsync(post);
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         ctx.JSInterop.Mode = JSRuntimeMode.Loose;
-        ctx.AddTestAuthorization();
+        ctx.AddAuthorization();
         RegisterComponents(ctx);
         ctx.ComponentFactories.AddStub<HeadContent>(ps => ps.Get(p => p.ChildContent));
-        var cut = ctx.RenderComponent<ShowBlogPostPage>(
+        var cut = ctx.Render<ShowBlogPostPage>(
             p => p.Add(b => b.BlogPostId, post.Id));
 
         var structuredData = cut.FindComponent<StructuredData>();
@@ -104,17 +104,17 @@ public async Task ShouldSetStructuredData()
     [Fact]
     public void ShouldShowErrorPageWhenBlogPostNotFound()
     {
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         ctx.JSInterop.Mode = JSRuntimeMode.Loose;
         RegisterComponents(ctx);
 
-        var cut = ctx.RenderComponent<ShowBlogPostPage>();
+        var cut = ctx.Render<ShowBlogPostPage>();
 
         cut.FindAll(".blogpost-content").Should().HaveCount(0);
         cut.FindAll("#no-blog-post-error").Should().HaveCount(1);
     }
 
-    private void RegisterComponents(TestContextBase ctx, ILocalStorageService localStorageService = null)
+    private void RegisterComponents(BunitContext ctx, ILocalStorageService localStorageService = null)
     {
         ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => localStorageService ?? Substitute.For<ILocalStorageService>());
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Admin/BlogPostAdminActionsTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Admin/BlogPostAdminActionsTests.cs
index 69e716ef..50983c38 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Admin/BlogPostAdminActionsTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Admin/BlogPostAdminActionsTests.cs
@@ -15,11 +15,11 @@ public async Task ShouldDeleteBlogPostWhenOkClicked()
     {
         const string blogPostId = "2";
         var repositoryMock = Substitute.For<IRepository<BlogPost>>();
-        using var ctx = new TestContext();
-        ctx.AddTestAuthorization().SetAuthorized("s");
+        using var ctx = new BunitContext();
+        ctx.AddAuthorization().SetAuthorized("s");
         ctx.Services.AddSingleton(repositoryMock);
         ctx.Services.AddSingleton(Substitute.For<IToastService>());
-        var cut = ctx.RenderComponent<BlogPostAdminActions>(s => s.Add(p => p.BlogPostId, blogPostId));
+        var cut = ctx.Render<BlogPostAdminActions>(s => s.Add(p => p.BlogPostId, blogPostId));
         cut.Find("#delete-blogpost").Click();
 
         cut.Find("#ok").Click();
@@ -32,11 +32,11 @@ public async Task ShouldNotDeleteBlogPostWhenCancelClicked()
     {
         const string blogPostId = "2";
         var repositoryMock = Substitute.For<IRepository<BlogPost>>();
-        using var ctx = new TestContext();
-        ctx.AddTestAuthorization().SetAuthorized("s");
+        using var ctx = new BunitContext();
+        ctx.AddAuthorization().SetAuthorized("s");
         ctx.Services.AddSingleton(repositoryMock);
         ctx.Services.AddSingleton(Substitute.For<IToastService>());
-        var cut = ctx.RenderComponent<BlogPostAdminActions>(s => s.Add(p => p.BlogPostId, blogPostId));
+        var cut = ctx.Render<BlogPostAdminActions>(s => s.Add(p => p.BlogPostId, blogPostId));
         cut.Find("#delete-blogpost").Click();
 
         cut.Find("#cancel").Click();
@@ -49,12 +49,12 @@ public void ShouldGoToEditPageOnEditClick()
     {
         const string blogPostId = "2";
         var repositoryMock = Substitute.For<IRepository<BlogPost>>();
-        using var ctx = new TestContext();
-        ctx.AddTestAuthorization().SetAuthorized("s");
+        using var ctx = new BunitContext();
+        ctx.AddAuthorization().SetAuthorized("s");
         ctx.Services.AddSingleton(repositoryMock);
         ctx.Services.AddSingleton(Substitute.For<IToastService>());
         var navigationManager = ctx.Services.GetRequiredService<NavigationManager>();
-        var cut = ctx.RenderComponent<BlogPostAdminActions>(s => s.Add(p => p.BlogPostId, blogPostId));
+        var cut = ctx.Render<BlogPostAdminActions>(s => s.Add(p => p.BlogPostId, blogPostId));
 
         cut.Find("#edit-blogpost").Click();
 
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/ConfirmDialogTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/ConfirmDialogTests.cs
index d9127733..20a8c959 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/ConfirmDialogTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/ConfirmDialogTests.cs
@@ -8,8 +8,8 @@ public class ConfirmDialogTests
     public void ShouldInvokeEventOnOkClick()
     {
         var okWasClicked = false;
-        using var ctx = new TestContext();
-        var cut = ctx.RenderComponent<ConfirmDialog>(
+        using var ctx = new BunitContext();
+        var cut = ctx.Render<ConfirmDialog>(
             b => b
                 .Add(p => p.OnYesPressed, _ => okWasClicked = true));
         cut.Instance.Open();
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/NavMenuTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/NavMenuTests.cs
index cae50eb6..fa6a531c 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/NavMenuTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/NavMenuTests.cs
@@ -9,7 +9,7 @@
 
 namespace LinkDotNet.Blog.IntegrationTests.Web.Shared;
 
-public class NavMenuTests : TestContext
+public class NavMenuTests : BunitContext
 {
     public NavMenuTests()
     {
@@ -20,9 +20,9 @@ public NavMenuTests()
     public void ShouldNavigateToSearchPage()
     {
         Services.AddScoped(_ => Options.Create(new ApplicationConfiguration()));
-        this.AddTestAuthorization();
+        this.AddAuthorization();
         var navigationManager = Services.GetRequiredService<NavigationManager>();
-        var cut = RenderComponent<NavMenu>();
+        var cut = Render<NavMenu>();
         cut.FindComponent<SearchInput>().Find("input").Change("Text");
 
         cut.FindComponent<SearchInput>().Find("button").Click();
@@ -38,9 +38,9 @@ public void ShouldDisplayAboutMePage()
             IsAboutMeEnabled = true
         });
         Services.AddScoped(_ => config);
-        this.AddTestAuthorization();
+        this.AddAuthorization();
 
-        var cut = RenderComponent<NavMenu>();
+        var cut = Render<NavMenu>();
 
         cut
             .FindAll(".nav-link").ToList()
@@ -53,8 +53,8 @@ public void ShouldPassCorrectUriToComponent()
     {
         var config = Options.Create(new ProfileInformation());
         Services.AddScoped(_ => config);
-        this.AddTestAuthorization();
-        var cut = RenderComponent<NavMenu>();
+        this.AddAuthorization();
+        var cut = Render<NavMenu>();
 
         Services.GetRequiredService<NavigationManager>().NavigateTo("test");
 
@@ -73,9 +73,9 @@ public void ShouldShowBrandImageIfAvailable()
         var profileInfoConfig = Options.Create(new ProfileInformation());
         Services.AddScoped(_ => profileInfoConfig);
 
-        this.AddTestAuthorization();
+        this.AddAuthorization();
 
-        var cut = RenderComponent<NavMenu>();
+        var cut = Render<NavMenu>();
 
         var brandImage = cut.Find(".nav-brand img");
         var image = brandImage as IHtmlImageElement;
@@ -98,9 +98,9 @@ public void ShouldShowBlogNameWhenNotBrand(string brandUrl)
         var profileInfoConfig = Options.Create(new ProfileInformation());
         Services.AddScoped(_ => profileInfoConfig);
         
-        this.AddTestAuthorization();
+        this.AddAuthorization();
 
-        var cut = RenderComponent<NavMenu>();
+        var cut = Render<NavMenu>();
 
         var brandImage = cut.Find(".nav-brand");
         var image = brandImage as IHtmlAnchorElement;
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/ProfileTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/ProfileTests.cs
index 3ac6b701..74c3c1b3 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/ProfileTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/ProfileTests.cs
@@ -12,7 +12,7 @@
 
 namespace LinkDotNet.Blog.IntegrationTests.Web.Shared;
 
-public class ProfileTests : TestContext
+public class ProfileTests : BunitContext
 {
     [Fact]
     public void ShouldRenderAllItemsSortedByOrder()
@@ -177,11 +177,11 @@ private static void SetupGetAll(
         return (repoMock, calcMock);
     }
 
-    private IRenderedComponent<Profile> RenderProfileWithEmptyInformation()
-        => RenderComponent<Profile>(p => p.Add(s => s.ProfileInformation, new()));
+    private RenderedComponent<Profile> RenderProfileWithEmptyInformation()
+        => Render<Profile>(p => p.Add(s => s.ProfileInformation, new()));
 
-    private IRenderedComponent<Profile> RenderProfileInAdmin()
-        => RenderComponent<Profile>(p => p
+    private RenderedComponent<Profile> RenderProfileInAdmin()
+        => Render<Profile>(p => p
             .Add(s => s.ProfileInformation, new())
             .Add(s => s.ShowAdminActions, true));
 }
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Skills/SkillTableTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Skills/SkillTableTests.cs
index 66daa331..085c411a 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Skills/SkillTableTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Skills/SkillTableTests.cs
@@ -15,11 +15,11 @@ public class SkillTableTests : SqlDatabaseTestBase<Skill>
     public async Task ShouldDeleteItem()
     {
         var skill = new SkillBuilder().WithSkillName("C#").Build();
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         await Repository.StoreAsync(skill);
         ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => Substitute.For<IToastService>());
-        var cut = ctx.RenderComponent<SkillTable>(p =>
+        var cut = ctx.Render<SkillTable>(p =>
             p.Add(s => s.ShowAdminActions, true));
 
         cut.WaitForComponent<SkillTag>().Find("button").Click();
@@ -32,10 +32,10 @@ public async Task ShouldDeleteItem()
     [Fact]
     public async Task ShouldAddSkill()
     {
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => Substitute.For<IToastService>());
-        var cut = ctx.RenderComponent<SkillTable>(p =>
+        var cut = ctx.Render<SkillTable>(p =>
             p.Add(s => s.ShowAdminActions, true));
         cut.Find("button").Click();
         var dialog = cut.FindComponent<AddSkillDialog>();
@@ -58,13 +58,13 @@ public async Task ShouldAddSkill()
     [Fact]
     public async Task ShouldNotAllowToEditSkillTagsWhenNotAdmin()
     {
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         var skill = new SkillBuilder().Build();
         await Repository.StoreAsync(skill);
         ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => Substitute.For<IToastService>());
 
-        var cut = ctx.RenderComponent<SkillTable>(p =>
+        var cut = ctx.Render<SkillTable>(p =>
             p.Add(s => s.ShowAdminActions, false));
 
         cut.WaitForComponent<SkillTag>().Instance.ShowAdminActions.Should().BeFalse();
@@ -73,13 +73,13 @@ public async Task ShouldNotAllowToEditSkillTagsWhenNotAdmin()
     [Fact]
     public async Task ShouldUpdateProficiencyWhenSkillTagDragged()
     {
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         var skill = new SkillBuilder().WithProficiencyLevel(ProficiencyLevel.Familiar).Build();
         await DbContext.AddAsync(skill);
         await DbContext.SaveChangesAsync();
         ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => Substitute.For<IToastService>());
-        var cut = ctx.RenderComponent<SkillTable>(p =>
+        var cut = ctx.Render<SkillTable>(p =>
             p.Add(s => s.ShowAdminActions, true));
         cut.WaitForElement(".skill-tag");
 
@@ -93,13 +93,13 @@ public async Task ShouldUpdateProficiencyWhenSkillTagDragged()
     [Fact]
     public async Task ShouldStayOnSameProficiencyWhenDroppedOnSameProficiencyLevel()
     {
-        using var ctx = new TestContext();
+        using var ctx = new BunitContext();
         var skill = new SkillBuilder().WithProficiencyLevel(ProficiencyLevel.Familiar).Build();
         await DbContext.AddAsync(skill);
         await DbContext.SaveChangesAsync();
         ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => Substitute.For<IToastService>());
-        var cut = ctx.RenderComponent<SkillTable>(p =>
+        var cut = ctx.Render<SkillTable>(p =>
             p.Add(s => s.ShowAdminActions, true));
         cut.WaitForElement(".skill-tag");
 
diff --git a/tests/LinkDotNet.Blog.TestUtilities/BunitExtensions.cs b/tests/LinkDotNet.Blog.TestUtilities/BunitExtensions.cs
index 561627c2..22ad1afb 100644
--- a/tests/LinkDotNet.Blog.TestUtilities/BunitExtensions.cs
+++ b/tests/LinkDotNet.Blog.TestUtilities/BunitExtensions.cs
@@ -6,14 +6,14 @@ namespace LinkDotNet.Blog.TestUtilities;
 
 public static class BunitExtensions
 {
-    public static IRenderedComponent<TComponent> WaitForComponent<TComponent>(this IRenderedFragment component) 
+    public static RenderedComponent<TComponent> WaitForComponent<TComponent>(this RenderedFragment component) 
         where TComponent : IComponent
     {
         component.WaitForState(component.HasComponent<TComponent>);
         return component.FindComponent<TComponent>();
     }
     
-    public static IReadOnlyList<IRenderedComponent<TComponent>> WaitForComponents<TComponent>(this IRenderedFragment component) 
+    public static IReadOnlyList<RenderedComponent<TComponent>> WaitForComponents<TComponent>(this RenderedFragment component) 
         where TComponent : IComponent
     {
         component.WaitForState(component.HasComponent<TComponent>);
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/AboutMePageTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/AboutMePageTests.cs
index 7cd9e0b5..d9966085 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/AboutMePageTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/AboutMePageTests.cs
@@ -13,12 +13,12 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.AboutMe;
 
-public class AboutMePageTests : TestContext
+public class AboutMePageTests : BunitContext
 {
     [Fact]
     public void ShouldPassIsAuthenticated()
     {
-        this.AddTestAuthorization().SetAuthorized("test");
+        AddAuthorization().SetAuthorized("test");
         var config = new ProfileInformation { ProfilePictureUrl = string.Empty };
         
         var applicationConfiguration = new ApplicationConfiguration
@@ -28,7 +28,7 @@ public void ShouldPassIsAuthenticated()
         
         SetupMocks(config, applicationConfiguration);
 
-        var cut = RenderComponent<AboutMePage>();
+        var cut = Render<AboutMePage>();
 
         cut.FindComponent<Profile>().Instance.ShowAdminActions.Should().BeTrue();
         cut.FindComponent<SkillTable>().Instance.ShowAdminActions.Should().BeTrue();
@@ -38,7 +38,7 @@ public void ShouldPassIsAuthenticated()
     [Fact]
     public void ShouldNotShowWhenEnabledFalse()
     {
-        this.AddTestAuthorization().SetNotAuthorized();
+        this.AddAuthorization().SetNotAuthorized();
         var config = new ProfileInformation();
         
         var applicationConfiguration = new ApplicationConfiguration
@@ -48,7 +48,7 @@ public void ShouldNotShowWhenEnabledFalse()
         
         SetupMocks(config, applicationConfiguration);
 
-        var cut = RenderComponent<AboutMePage>();
+        var cut = Render<AboutMePage>();
 
         cut.FindComponents<Profile>().Any().Should().BeFalse();
         cut.FindComponents<SkillTable>().Any().Should().BeFalse();
@@ -57,7 +57,7 @@ public void ShouldNotShowWhenEnabledFalse()
     [Fact]
     public void ShouldSetOgData()
     {
-        this.AddTestAuthorization().SetNotAuthorized();
+        this.AddAuthorization().SetNotAuthorized();
         var profileInformation = new ProfileInformation
         {
             Name = "My Name",
@@ -69,7 +69,7 @@ public void ShouldSetOgData()
         };
         SetupMocks(profileInformation, applicationConfiguration);
 
-        var cut = RenderComponent<AboutMePage>();
+        var cut = Render<AboutMePage>();
 
         var ogData = cut.FindComponent<OgData>().Instance;
         ogData.AbsolutePreviewImageUrl.Should().Be("http://localhost/someurl");
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/Components/AddProfileShortItemTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/Components/AddProfileShortItemTests.cs
index a8a4cbfc..cd0799ab 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/Components/AddProfileShortItemTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/Components/AddProfileShortItemTests.cs
@@ -2,13 +2,13 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.AboutMe.Components;
 
-public class AddProfileShortItemTests : TestContext
+public class AddProfileShortItemTests : BunitContext
 {
     [Fact]
     public void ShouldAddShortItem()
     {
         string addedItem = null;
-        var cut = RenderComponent<AddProfileShortItem>(
+        var cut = Render<AddProfileShortItem>(
             p => p.Add(s => s.ValueAdded, c => addedItem = c));
         cut.Find("input").Change("Key");
 
@@ -24,7 +24,7 @@ public void ShouldAddShortItem()
     public void ShouldNotAddItemWhenKeyOrValueIsEmpty(string content)
     {
         var wasInvoked = false;
-        var cut = RenderComponent<AddProfileShortItem>(
+        var cut = Render<AddProfileShortItem>(
             p => p.Add(s => s.ValueAdded, _ => wasInvoked = true));
         cut.Find("input").Change(content);
 
@@ -36,7 +36,7 @@ public void ShouldNotAddItemWhenKeyOrValueIsEmpty(string content)
     [Fact]
     public void ShouldEmptyModelAfterTextEntered()
     {
-        var cut = RenderComponent<AddProfileShortItem>();
+        var cut = Render<AddProfileShortItem>();
         cut.Find("input").Change("Key");
 
         cut.Find("button").Click();
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/Components/AddSkillDialogTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/Components/AddSkillDialogTests.cs
index 13969806..12c291f2 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/Components/AddSkillDialogTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/Components/AddSkillDialogTests.cs
@@ -5,7 +5,7 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.AboutMe.Components;
 
-public class AddSkillDialogTests : TestContext
+public class AddSkillDialogTests : BunitContext
 {
     [Fact]
     public void ShouldCreateSkill()
@@ -13,7 +13,7 @@ public void ShouldCreateSkill()
         Skill addedSkill = null;
         var toastServiceMock = Substitute.For<IToastService>();
         Services.AddScoped(_ => toastServiceMock);
-        var cut = RenderComponent<AddSkillDialog>(p =>
+        var cut = Render<AddSkillDialog>(p =>
             p.Add(s => s.SkillAdded, t => addedSkill = t));
         cut.Find("#title").Change("C#");
         cut.Find("#image").Change("Url");
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/Components/SkillTagTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/Components/SkillTagTests.cs
index 3a2b2a39..d1dc1001 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/Components/SkillTagTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/Components/SkillTagTests.cs
@@ -4,14 +4,14 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.AboutMe.Components;
 
-public class SkillTagTests : TestContext
+public class SkillTagTests : BunitContext
 {
     [Fact]
     public void ShouldRenderImageAndText()
     {
         var skill = new SkillBuilder().WithSkillName("C#").WithIconUrl("test").Build();
 
-        var cut = RenderComponent<SkillTag>(p => p.Add(
+        var cut = Render<SkillTag>(p => p.Add(
             s => s.Skill, skill));
 
         cut.Find("span").TextContent.Should().Contain("C#");
@@ -24,7 +24,7 @@ public void ShouldNotRenderImageWhenNotAvailable()
     {
         var skill = new SkillBuilder().WithIconUrl(null).Build();
 
-        var cut = RenderComponent<SkillTag>(p => p.Add(
+        var cut = Render<SkillTag>(p => p.Add(
             s => s.Skill, skill));
 
         cut.FindAll("img").Should().HaveCount(0);
@@ -35,7 +35,7 @@ public void ShouldInvokeDeleteEvent()
     {
         var skill = new SkillBuilder().Build();
         var wasInvoked = false;
-        var cut = RenderComponent<SkillTag>(p => p
+        var cut = Render<SkillTag>(p => p
             .Add(
             s => s.Skill, skill)
             .Add(s => s.ShowAdminActions, true)
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/BlogPostEditor/Components/CreateNewBlogPostTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/BlogPostEditor/Components/CreateNewBlogPostTests.cs
index 4ecb2dfe..d3bf3cfb 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/BlogPostEditor/Components/CreateNewBlogPostTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/BlogPostEditor/Components/CreateNewBlogPostTests.cs
@@ -9,7 +9,7 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.Admin.BlogPostEditor.Components;
 
-public class CreateNewBlogPostTests : TestContext
+public class CreateNewBlogPostTests : BunitContext
 {
     public CreateNewBlogPostTests()
     {
@@ -21,7 +21,7 @@ public CreateNewBlogPostTests()
     public void ShouldCreateNewBlogPostWhenValidDataGiven()
     {
         BlogPost blogPost = null;
-        var cut = RenderComponent<CreateNewBlogPost>(
+        var cut = Render<CreateNewBlogPost>(
             p => p.Add(c => c.OnBlogPostCreated, bp => blogPost = bp));
         cut.Find("#title").Input("My Title");
         cut.Find("#short").Input("My short Description");
@@ -56,7 +56,7 @@ public void ShouldFillGivenBlogPost()
             .WithTags("tag1", "tag2")
             .Build();
         BlogPost blogPostFromComponent = null;
-        var cut = RenderComponent<CreateNewBlogPost>(
+        var cut = Render<CreateNewBlogPost>(
             p =>
                 p.Add(c => c.OnBlogPostCreated, bp => blogPostFromComponent = bp)
                  .Add(c => c.BlogPost, blogPost));
@@ -76,7 +76,7 @@ public void ShouldFillGivenBlogPost()
     public void ShouldNotDeleteModelWhenSet()
     {
         BlogPost blogPost = null;
-        var cut = RenderComponent<CreateNewBlogPost>(
+        var cut = Render<CreateNewBlogPost>(
             p => p.Add(c => c.ClearAfterCreated, true)
                 .Add(c => c.OnBlogPostCreated, post => blogPost = post));
         cut.Find("#title").Input("My Title");
@@ -96,7 +96,7 @@ public void ShouldNotDeleteModelWhenSet()
     public void ShouldNotDeleteModelWhenNotSet()
     {
         BlogPost blogPost = null;
-        var cut = RenderComponent<CreateNewBlogPost>(
+        var cut = Render<CreateNewBlogPost>(
             p => p.Add(c => c.ClearAfterCreated, false)
                 .Add(c => c.OnBlogPostCreated, post => blogPost = post));
         cut.Find("#title").Input("My Title");
@@ -118,7 +118,7 @@ public void ShouldNotUpdateUpdatedDateWhenCheckboxSet()
         var someWhen = new DateTime(1991, 5, 17);
         var originalBlogPost = new BlogPostBuilder().WithUpdatedDate(someWhen).Build();
         BlogPost blogPostFromComponent = null;
-        var cut = RenderComponent<CreateNewBlogPost>(
+        var cut = Render<CreateNewBlogPost>(
             p =>
                 p.Add(c => c.OnBlogPostCreated, bp => blogPostFromComponent = bp)
                     .Add(c => c.BlogPost, originalBlogPost));
@@ -137,7 +137,7 @@ public void ShouldNotUpdateUpdatedDateWhenCheckboxSet()
     [Fact]
     public void ShouldNotSetOptionToNotUpdateUpdatedDateOnInitialCreate()
     {
-        var cut = RenderComponent<CreateNewBlogPost>();
+        var cut = Render<CreateNewBlogPost>();
 
         var found = cut.FindAll("#updatedate");
 
@@ -148,7 +148,7 @@ public void ShouldNotSetOptionToNotUpdateUpdatedDateOnInitialCreate()
     public void ShouldAcceptInputWithoutLosingFocusOrEnter()
     {
         BlogPost blogPost = null;
-        var cut = RenderComponent<CreateNewBlogPost>(
+        var cut = Render<CreateNewBlogPost>(
             p => p.Add(c => c.OnBlogPostCreated, bp => blogPost = bp));
         cut.Find("#title").Input("My Title");
         cut.Find("#short").Input("My short Description");
@@ -173,7 +173,7 @@ public void ShouldAcceptInputWithoutLosingFocusOrEnter()
     [Fact]
     public void ShouldStopExternalNavigationWhenDirty()
     {
-        var cut = RenderComponent<CreateNewBlogPost>();
+        var cut = Render<CreateNewBlogPost>();
 
         cut.Find("#title").Input("Hey");
 
@@ -185,9 +185,9 @@ public void ShouldStopInternalNavigationWhenDirty()
     {
         JSInterop.Setup<bool>("confirm", "You have unsaved changes. Are you sure you want to continue?")
             .SetResult(false);
-        var cut = RenderComponent<CreateNewBlogPost>();
+        var cut = Render<CreateNewBlogPost>();
         cut.Find("#tags").Change("Hey");
-        var fakeNavigationManager = Services.GetRequiredService<FakeNavigationManager>();
+        var fakeNavigationManager = Services.GetRequiredService<BunitNavigationManager>();
 
         fakeNavigationManager.NavigateTo("/internal");
 
@@ -199,9 +199,9 @@ public void ShouldStopInternalNavigationWhenDirty()
     public void ShouldNotBlogNavigationOnInitialLoad()
     {
         var blogPost = new BlogPostBuilder().Build();
-        RenderComponent<CreateNewBlogPost>(
+        Render<CreateNewBlogPost>(
             p => p.Add(s => s.BlogPost, blogPost));
-        var fakeNavigationManager = Services.GetRequiredService<FakeNavigationManager>();
+        var fakeNavigationManager = Services.GetRequiredService<BunitNavigationManager>();
 
         fakeNavigationManager.NavigateTo("/internal");
 
@@ -213,7 +213,7 @@ public void ShouldNotBlogNavigationOnInitialLoad()
     public void GivenBlogPostWithSchedule_ShouldSetSchedule()
     {
         BlogPost blogPost = null;
-        var cut = RenderComponent<CreateNewBlogPost>(
+        var cut = Render<CreateNewBlogPost>(
             p => p.Add(c => c.OnBlogPostCreated, bp => blogPost = bp));
         cut.Find("#title").Input("My Title");
         cut.Find("#short").Input("My short Description");
@@ -231,7 +231,7 @@ public void GivenBlogPostWithSchedule_ShouldSetSchedule()
     public void GivenBlogPost_WhenEnteringScheduledDate_ThenIsPublishedSetToFalse()
     {
         BlogPost blogPost = null;
-        var cut = RenderComponent<CreateNewBlogPost>(
+        var cut = Render<CreateNewBlogPost>(
             p => p.Add(c => c.OnBlogPostCreated, bp => blogPost = bp));
         cut.Find("#title").Input("My Title");
         cut.Find("#short").Input("My short Description");
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/BlogPostEditor/Components/UploadFileTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/BlogPostEditor/Components/UploadFileTests.cs
index eb11564e..ee4b1f6e 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/BlogPostEditor/Components/UploadFileTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/BlogPostEditor/Components/UploadFileTests.cs
@@ -6,7 +6,7 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.Admin.BlogPostEditor.Components;
 
-public class UploadFileTests : TestContext
+public class UploadFileTests : BunitContext
 {
     public UploadFileTests()
     {
@@ -27,7 +27,7 @@ public async Task ShouldCallProcessorWhenFilesUploaded()
             file,
         });
         Services.AddScoped(_ => fileProcessor);
-        var cut = RenderComponent<UploadFile>(
+        var cut = Render<UploadFile>(
             s => s.Add(p => p.OnFileUploaded, f => invokedContent = f));
         var inputComponent = cut.FindComponent<InputFile>().Instance;
 
@@ -40,7 +40,7 @@ public async Task ShouldCallProcessorWhenFilesUploaded()
     public void ShouldIndicateDragAndDropBehavior()
     {
         Services.AddScoped(_ => Substitute.For<IFileProcessor>());
-        var cut = RenderComponent<UploadFile>();
+        var cut = Render<UploadFile>();
 
         cut.Find("input").DragEnter();
 
@@ -51,7 +51,7 @@ public void ShouldIndicateDragAndDropBehavior()
     public void ShouldRemoveDragAndDropBehaviorWhenOutside()
     {
         Services.AddScoped(_ => Substitute.For<IFileProcessor>());
-        var cut = RenderComponent<UploadFile>();
+        var cut = Render<UploadFile>();
         cut.Find("input").DragEnter();
 
         cut.Find("input").DragLeave();
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Dashboard/Components/DateRangeSelectorTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Dashboard/Components/DateRangeSelectorTests.cs
index 9753f089..2b4947eb 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Dashboard/Components/DateRangeSelectorTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Dashboard/Components/DateRangeSelectorTests.cs
@@ -3,13 +3,13 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.Admin.Dashboard.Components;
 
-public class DateRangeSelectorTests : TestContext
+public class DateRangeSelectorTests : BunitContext
 {
     [Fact]
     public void ShouldSetBeginDateWhenSet()
     {
         Filter filter = null;
-        var cut = RenderComponent<DateRangeSelector>(p => p.Add(s => s.FilterChanged, f =>
+        var cut = Render<DateRangeSelector>(p => p.Add(s => s.FilterChanged, f =>
         {
             filter = f;
         }));
@@ -25,7 +25,7 @@ public void ShouldSetBeginDateWhenSet()
     public void ShouldSetEndDateWhenSet()
     {
         Filter filter = null;
-        var cut = RenderComponent<DateRangeSelector>(p => p.Add(s => s.FilterChanged, f =>
+        var cut = Render<DateRangeSelector>(p => p.Add(s => s.FilterChanged, f =>
         {
             filter = f;
         }));
@@ -41,7 +41,7 @@ public void ShouldSetEndDateWhenSet()
     public void ShouldReset()
     {
         Filter filter = null;
-        var cut = RenderComponent<DateRangeSelector>(p => p.Add(s => s.FilterChanged, f =>
+        var cut = Render<DateRangeSelector>(p => p.Add(s => s.FilterChanged, f =>
         {
             filter = f;
         }));
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Settings/SettingsPageTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Settings/SettingsPageTests.cs
index f2aac34f..2d93aa10 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Settings/SettingsPageTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Settings/SettingsPageTests.cs
@@ -7,7 +7,7 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.Admin.Settings;
 
-public class SettingsPageTests : TestContext
+public class SettingsPageTests : BunitContext
 {
     [Fact]
     public void GivenSettingsPage_WhenClicking_InvalidateCacheButton_TokenIsCancelled()
@@ -16,7 +16,7 @@ public void GivenSettingsPage_WhenClicking_InvalidateCacheButton_TokenIsCancelle
         Services.AddScoped(_ => cacheInvalidator);
         Services.AddScoped(_ => Options.Create<ApplicationConfiguration>(new()));
         Services.AddScoped(_ => Substitute.For<IToastService>());
-        var cut = RenderComponent<SettingsPage>();
+        var cut = Render<SettingsPage>();
         var invalidateCacheButton = cut.Find("#invalidate-cache");
         
         invalidateCacheButton.Click();
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Sitemap/Services/SitemapServiceTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Sitemap/Services/SitemapServiceTests.cs
index fce443e3..ca55f7dc 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Sitemap/Services/SitemapServiceTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Sitemap/Services/SitemapServiceTests.cs
@@ -9,17 +9,17 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.Admin.Sitemap.Services;
 
-public class SitemapServiceTests : TestContext
+public class SitemapServiceTests : BunitContext
 {
     private readonly IRepository<BlogPost> repositoryMock;
     private readonly IXmlFileWriter xmlFileWriterMock;
     private readonly SitemapService sut;
-    private readonly FakeNavigationManager fakeNavigationManager;
+    private readonly BunitNavigationManager fakeNavigationManager;
 
     public SitemapServiceTests()
     {
         repositoryMock = Substitute.For<IRepository<BlogPost>>();
-        fakeNavigationManager = new FakeNavigationManager(Renderer);
+        fakeNavigationManager = new BunitNavigationManager(this);
 
         xmlFileWriterMock = Substitute.For<IXmlFileWriter>();
         sut = new SitemapService(
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Sitemap/SitemapPageTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Sitemap/SitemapPageTests.cs
index 79b33827..db74b33c 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Sitemap/SitemapPageTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Sitemap/SitemapPageTests.cs
@@ -8,17 +8,17 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.Admin.Sitemap;
 
-public class SitemapPageTests : TestContext
+public class SitemapPageTests : BunitContext
 {
     [Fact]
     public async Task ShouldSaveSitemap()
     {
-        this.AddTestAuthorization().SetAuthorized("steven");
+        this.AddAuthorization().SetAuthorized("steven");
         var sitemapMock = Substitute.For<ISitemapService>();
         Services.AddScoped(_ => sitemapMock);
         var sitemap = new SitemapUrlSet();
         sitemapMock.CreateSitemapAsync().Returns(sitemap);
-        var cut = RenderComponent<SitemapPage>();
+        var cut = Render<SitemapPage>();
 
         cut.Find("button").Click();
 
@@ -28,7 +28,7 @@ public async Task ShouldSaveSitemap()
     [Fact]
     public void ShouldDisplaySitemap()
     {
-        this.AddTestAuthorization().SetAuthorized("steven");
+        this.AddAuthorization().SetAuthorized("steven");
         var sitemapMock = Substitute.For<ISitemapService>();
         Services.AddScoped(_ => sitemapMock);
         var sitemap = new SitemapUrlSet
@@ -39,7 +39,7 @@ public void ShouldDisplaySitemap()
             },
         };
         sitemapMock.CreateSitemapAsync().Returns(sitemap);
-        var cut = RenderComponent<SitemapPage>();
+        var cut = Render<SitemapPage>();
 
         cut.Find("button").Click();
 
@@ -51,7 +51,7 @@ public void ShouldDisplaySitemap()
     [Fact]
     public void ShouldShowLoadingWhenGenerating()
     {
-        this.AddTestAuthorization().SetAuthorized("steven");
+        this.AddAuthorization().SetAuthorized("steven");
         var sitemapMock = Substitute.For<ISitemapService>();
         Services.AddScoped(_ => sitemapMock);
         var sitemap = new SitemapUrlSet
@@ -67,7 +67,7 @@ public void ShouldShowLoadingWhenGenerating()
             return sitemap;
         }));
 
-        var cut = RenderComponent<SitemapPage>();
+        var cut = Render<SitemapPage>();
 
         cut.Find("button").Click();
 
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/OgDataTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/OgDataTests.cs
index cbc818f9..484aa363 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/OgDataTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/OgDataTests.cs
@@ -7,14 +7,14 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.Components;
 
-public class OgDataTests : TestContext
+public class OgDataTests : BunitContext
 {
     [Fact]
     public void ShouldRenderMetaTagsWhenSet()
     {
         ComponentFactories.AddStub<HeadContent>(ps => ps.Get(p => p.ChildContent));
 
-        var cut = RenderComponent<OgData>(p => p
+        var cut = Render<OgData>(p => p
             .Add(s => s.Title, "Title")
             .Add(s => s.Description, "Description")
             .Add(s => s.AbsolutePreviewImageUrl, "http://localhost/image.png")
@@ -31,7 +31,7 @@ public void ShouldNotSetMetaInformationWhenNotProvided()
     {
         ComponentFactories.AddStub<HeadContent>(ps => ps.Get(p => p.ChildContent));
 
-        var cut = RenderComponent<OgData>(p => p
+        var cut = Render<OgData>(p => p
             .Add(s => s.Title, "Title"));
 
         GetMetaTagExists(cut, "image").Should().BeFalse();
@@ -46,7 +46,7 @@ public void ShouldSetCanoncialLink()
         Services.GetRequiredService<NavigationManager>().NavigateTo(expectedUri);
         ComponentFactories.AddStub<HeadContent>(ps => ps.Get(p => p.ChildContent));
 
-        var cut = RenderComponent<OgData>(p => p
+        var cut = Render<OgData>(p => p
             .Add(s => s.Title, "Title"));
 
         var link = cut.FindAll("link").FirstOrDefault(l => l.Attributes.Any(a => a.Name == "rel" && a.Value == "canonical")) as IHtmlLinkElement;
@@ -60,7 +60,7 @@ public void ShouldSetCanoncialLinkWithoutQueryParameter()
         ComponentFactories.AddStub<HeadContent>(ps => ps.Get(p => p.ChildContent));
         Services.GetRequiredService<NavigationManager>().NavigateTo("https://localhost.com/site?query=2");
 
-        var cut = RenderComponent<OgData>(p => p
+        var cut = Render<OgData>(p => p
             .Add(s => s.Title, "Title"));
 
         var link = cut.FindAll("link").FirstOrDefault(l => l.Attributes.Any(a => a.Name == "rel" && a.Value == "canonical")) as IHtmlLinkElement;
@@ -68,7 +68,7 @@ public void ShouldSetCanoncialLinkWithoutQueryParameter()
     }
 
     private static void AssertMetaTagExistsWithValue(
-        IRenderedFragment cut,
+        RenderedFragment cut,
         string metaTag,
         string metaTagValue,
         string ogPropertyName = null)
@@ -85,7 +85,7 @@ private static void AssertMetaTagExistsWithValue(
     }
 
     private static bool GetMetaTagExists(
-        IRenderedFragment cut,
+        RenderedFragment cut,
         string metaTag)
     {
         var metaTags = cut.FindAll("meta");
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/PreviewImageTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/PreviewImageTests.cs
index 1a69ae27..e8e9325a 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/PreviewImageTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/PreviewImageTests.cs
@@ -4,12 +4,12 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.Components;
 
-public class PreviewImageTests : TestContext
+public class PreviewImageTests : BunitContext
 {
     [Fact]
     public void ShouldOfferImageWhenProvided()
     {
-        var cut = RenderComponent<PreviewImage>(ps => ps
+        var cut = Render<PreviewImage>(ps => ps
             .Add(p => p.PreviewImageUrl, "http://image.png/")
             .Add(p => p.PreviewImageUrlFallback, "http://fallback.png/"));
 
@@ -26,7 +26,7 @@ public void ShouldOfferImageWhenProvided()
     [Fact]
     public void ShouldOfferOnlyImageWhenNoFallbackProvided()
     {
-        var cut = RenderComponent<PreviewImage>(ps => ps
+        var cut = Render<PreviewImage>(ps => ps
             .Add(p => p.PreviewImageUrl, "http://image.png/"));
 
         var image = cut.Find("img") as IHtmlImageElement;
@@ -40,7 +40,7 @@ public void ShouldOfferOnlyImageWhenNoFallbackProvided()
     [InlineData(false, "eager")]
     public void ShouldSetLazyLoadBehavior(bool lazyLoad, string expectedLazy)
     {
-        var cut = RenderComponent<PreviewImage>(ps => ps
+        var cut = Render<PreviewImage>(ps => ps
             .Add(p => p.PreviewImageUrl, "http://image.png/")
             .Add(p => p.PreviewImageUrlFallback, "http://fallback.png/")
             .Add(p => p.LazyLoadImage, lazyLoad));
@@ -57,7 +57,7 @@ public void ShouldSetLazyLoadBehavior(bool lazyLoad, string expectedLazy)
     [InlineData(false, "eager")]
     public void ShouldSetLazyLoadBehaviorNoFallback(bool lazyLoad, string expectedLazy)
     {
-        var cut = RenderComponent<PreviewImage>(ps => ps
+        var cut = Render<PreviewImage>(ps => ps
             .Add(p => p.PreviewImageUrl, "http://image.png/")
             .Add(p => p.LazyLoadImage, lazyLoad));
 
@@ -72,7 +72,7 @@ public void ShouldSetLazyLoadBehaviorNoFallback(bool lazyLoad, string expectedLa
     [InlineData("http://localhost/image.avif", "image/avif")]
     public void ShouldDetectFileTypes(string fileName, string mimeType)
     {
-        var cut = RenderComponent<PreviewImage>(ps => ps
+        var cut = Render<PreviewImage>(ps => ps
             .Add(p => p.PreviewImageUrl, fileName)
             .Add(p => p.PreviewImageUrlFallback, "not empty"));
 
@@ -87,7 +87,7 @@ public void ShouldDetectFileTypes(string fileName, string mimeType)
     [InlineData(false, "auto")]
     public void ShouldSetDecodingBehavior(bool lazyLoad, string expectedBehaviour)
     {
-        var cut = RenderComponent<PreviewImage>(ps => ps
+        var cut = Render<PreviewImage>(ps => ps
             .Add(p => p.PreviewImageUrl, "http://image.png/")
             .Add(p => p.PreviewImageUrlFallback, "http://fallback.png/")
             .Add(p => p.LazyLoadImage, lazyLoad));
@@ -104,7 +104,7 @@ public void ShouldSetDecodingBehavior(bool lazyLoad, string expectedBehaviour)
     [InlineData(false, "auto")]
     public void ShouldSetDecodingBehaviorNoFallback(bool lazyLoad, string expectedBehaviour)
     {
-        var cut = RenderComponent<PreviewImage>(ps => ps
+        var cut = Render<PreviewImage>(ps => ps
             .Add(p => p.PreviewImageUrl, "http://image.png/")
             .Add(p => p.LazyLoadImage, lazyLoad));
 
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/ShortBlogPostTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/ShortBlogPostTests.cs
index c913b7b1..90e25394 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/ShortBlogPostTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/ShortBlogPostTests.cs
@@ -5,14 +5,14 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.Components;
 
-public class ShortBlogPostTests : TestContext
+public class ShortBlogPostTests : BunitContext
 {
     [Fact]
     public void ShouldOpenBlogPost()
     {
         var blogPost = new BlogPostBuilder().Build();
         blogPost.Id = "SomeId";
-        var cut = RenderComponent<ShortBlogPost>(
+        var cut = Render<ShortBlogPost>(
             p => p.Add(c => c.BlogPost, blogPost));
 
         var readMore = cut.Find(".read-more a");
@@ -24,7 +24,7 @@ public void ShouldOpenBlogPost()
     public void ShouldNavigateToEscapedTagSiteWhenClickingOnTag()
     {
         var blogPost = new BlogPostBuilder().WithTags("Tag 1").Build();
-        var cut = RenderComponent<ShortBlogPost>(
+        var cut = Render<ShortBlogPost>(
             p => p.Add(c => c.BlogPost, blogPost));
 
         var searchByTagLink = cut.Find(".goto-tag");
@@ -37,7 +37,7 @@ public void WhenNoTagsAreGivenThenTagsAreNotShown()
     {
         var blogPost = new BlogPostBuilder().Build();
 
-        var cut = RenderComponent<ShortBlogPost>(
+        var cut = Render<ShortBlogPost>(
             p => p.Add(c => c.BlogPost, blogPost));
 
         cut.FindAll(".goto-tag").Should().BeEmpty();
@@ -49,7 +49,7 @@ public void GivenBlogPostThatIsScheduled_ThenIndicating()
         var blogPost = new BlogPostBuilder().IsPublished(false).WithScheduledPublishDate(new DateTime(2099, 1, 1))
             .Build();
 
-        var cut = RenderComponent<ShortBlogPost>(
+        var cut = Render<ShortBlogPost>(
             p => p.Add(c => c.BlogPost, blogPost));
 
         cut.Find(".schedule").Should().NotBeNull();
@@ -60,7 +60,7 @@ public void GivenBlogPostThatIsNotPublishedAndNotScheduled_ThenIndicating()
     {
         var blogPost = new BlogPostBuilder().IsPublished(false).Build();
 
-        var cut = RenderComponent<ShortBlogPost>(
+        var cut = Render<ShortBlogPost>(
             p => p.Add(c => c.BlogPost, blogPost));
 
         cut.Find(".draft").Should().NotBeNull();
@@ -71,7 +71,7 @@ public void GivenBlogPostThatIsPublished_ThenNoDraft()
     {
         var blogPost = new BlogPostBuilder().IsPublished(true).Build();
 
-        var cut = RenderComponent<ShortBlogPost>(
+        var cut = Render<ShortBlogPost>(
             p => p.Add(c => c.BlogPost, blogPost));
 
         cut.FindAll(".draft").Should().BeEmpty();
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/TextAreaWithShortcutsTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/TextAreaWithShortcutsTests.cs
index a73d559c..5da769d3 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/TextAreaWithShortcutsTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/TextAreaWithShortcutsTests.cs
@@ -3,7 +3,7 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.Components;
 
-public class TextAreaWithShortcutsTests : TestContext
+public class TextAreaWithShortcutsTests : BunitContext
 {
     [Theory]
     [InlineData("b", 0, 4, true, "**Test**")]
@@ -23,7 +23,7 @@ public void ShouldSetMarkerOnKeyUp(string key, int start, int end, bool ctrlPres
         };
         JSInterop.Mode = JSRuntimeMode.Loose;
         JSInterop.Setup<SelectionRange>("getSelectionFromElement", id).SetResult(range);
-        var cut = RenderComponent<TextAreaWithShortcuts>(
+        var cut = Render<TextAreaWithShortcuts>(
             p => p.Add(s => s.Id, id));
         cut.Find("textarea").Input("Test");
         cut.Find("textarea").KeyUp(key, ctrlKey: ctrlPressed);
@@ -40,7 +40,7 @@ public void ShouldSetCursorPosition()
         JSInterop.Mode = JSRuntimeMode.Loose;
         JSInterop.Setup<SelectionRange>("getSelectionFromElement", element)
             .SetResult(new SelectionRange { Start = 2, End = 5 });
-        var cut = RenderComponent<TextAreaWithShortcuts>(
+        var cut = Render<TextAreaWithShortcuts>(
             p => p.Add(s => s.Id, element));
         cut.Find($"#{element}").Input("Hello World");
 
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/AccessControlTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/AccessControlTests.cs
index 6b80293f..024b0cfb 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/AccessControlTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/AccessControlTests.cs
@@ -3,14 +3,14 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.Home.Components;
 
-public class AccessControlTests : TestContext
+public class AccessControlTests : BunitContext
 {
     [Fact]
     public void ShouldShowLoginAndHideAdminWhenNotLoggedIn()
     {
-        this.AddTestAuthorization();
+        this.AddAuthorization();
 
-        var cut = RenderComponent<AccessControl>();
+        var cut = Render<AccessControl>();
 
         cut.FindAll("a:contains('Admin')").Should().HaveCount(0);
         cut.FindAll("a:contains('Log in')").Should().HaveCount(1);
@@ -19,9 +19,9 @@ public void ShouldShowLoginAndHideAdminWhenNotLoggedIn()
     [Fact]
     public void ShouldShowLogoutAndAdminWhenLoggedIn()
     {
-        this.AddTestAuthorization().SetAuthorized("steven");
+        this.AddAuthorization().SetAuthorized("steven");
 
-        var cut = RenderComponent<AccessControl>();
+        var cut = Render<AccessControl>();
 
         cut.FindAll("a:contains('Admin')").Should().HaveCount(1);
         cut.FindAll("a:contains('Log out')").Should().HaveCount(1);
@@ -31,9 +31,9 @@ public void ShouldShowLogoutAndAdminWhenLoggedIn()
     public void LoginShouldHaveCurrentUriAsRedirectUri()
     {
         const string currentUri = "http://localhost/test";
-        this.AddTestAuthorization();
+        this.AddAuthorization();
 
-        var cut = RenderComponent<AccessControl>(
+        var cut = Render<AccessControl>(
             p => p.Add(s => s.CurrentUri, currentUri));
 
         ((IHtmlAnchorElement)cut.Find("a:contains('Log in')")).Href.Should().Contain(currentUri);
@@ -43,9 +43,9 @@ public void LoginShouldHaveCurrentUriAsRedirectUri()
     public void LogoutShouldHaveCurrentUriAsRedirectUri()
     {
         const string currentUri = "http://localhost/test";
-        this.AddTestAuthorization().SetAuthorized("steven");
+        this.AddAuthorization().SetAuthorized("steven");
 
-        var cut = RenderComponent<AccessControl>(
+        var cut = Render<AccessControl>(
             p => p.Add(s => s.CurrentUri, currentUri));
 
         ((IHtmlAnchorElement)cut.Find("a:contains('Log out')")).Href.Should().Contain(currentUri);
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/AnchorTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/AnchorTests.cs
index ca1c52a1..94af5443 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/AnchorTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/AnchorTests.cs
@@ -4,12 +4,12 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.Home.Components;
 
-public class AnchorTests : TestContext
+public class AnchorTests : BunitContext
 {
     [Fact]
     public void ShouldShowHrefWhenNotEmpty()
     {
-        var cut = RenderComponent<Anchor>(ps => ps
+        var cut = Render<Anchor>(ps => ps
             .Add(p => p.Href, "http://url/")
             .Add(p => p.CssClass, "page"));
 
@@ -22,7 +22,7 @@ public void ShouldShowHrefWhenNotEmpty()
     [Fact]
     public void ShouldNotShowHrefWhenEmpty()
     {
-        var cut = RenderComponent<Anchor>(ps => ps
+        var cut = Render<Anchor>(ps => ps
             .Add(p => p.Href, string.Empty)
             .Add(p => p.CssClass, "page"));
 
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/BlogPostNavigationTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/BlogPostNavigationTests.cs
index 6efa4792..a0d645db 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/BlogPostNavigationTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/BlogPostNavigationTests.cs
@@ -6,14 +6,14 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.Home.Components;
 
-public class BlogPostNavigationTests : TestContext
+public class BlogPostNavigationTests : BunitContext
 {
     [Fact]
     public void ShouldFireEventWhenGoingToNextPage()
     {
         var page = CreatePagedList(2, 3);
 
-        var cut = RenderComponent<BlogPostNavigation<BlogPost>>(p =>
+        var cut = Render<BlogPostNavigation<BlogPost>>(p =>
             p.Add(param => param.PageList, page));
 
         cut.FindAll("a").Cast<IHtmlAnchorElement>().Last().Href.Should().EndWith("/3");
@@ -24,7 +24,7 @@ public void ShouldFireEventWhenGoingToPreviousPage()
     {
         var page = CreatePagedList(2, 3);
 
-        var cut = RenderComponent<BlogPostNavigation<BlogPost>>(p =>
+        var cut = Render<BlogPostNavigation<BlogPost>>(p =>
             p.Add(param => param.PageList, page));
 
         cut.FindAll("a").Cast<IHtmlAnchorElement>().First().Href.Should().EndWith("/1");
@@ -34,7 +34,7 @@ public void ShouldFireEventWhenGoingToPreviousPage()
     public void ShouldNotFireNextWhenOnLastPage()
     {
         var page = CreatePagedList(2, 2);
-        var cut = RenderComponent<BlogPostNavigation<BlogPost>>(p =>
+        var cut = Render<BlogPostNavigation<BlogPost>>(p =>
             p.Add(param => param.PageList, page));
 
         cut.Find("li:last-child").ClassList.Should().Contain("disabled");
@@ -44,7 +44,7 @@ public void ShouldNotFireNextWhenOnLastPage()
     public void ShouldNotFireNextWhenOnFirstPage()
     {
         var page = CreatePagedList(1, 2);
-        var cut = RenderComponent<BlogPostNavigation<BlogPost>>(p =>
+        var cut = Render<BlogPostNavigation<BlogPost>>(p =>
             p.Add(param => param.PageList, page));
 
         cut.Find("li:first-child").ClassList.Should().Contain("disabled");
@@ -54,7 +54,7 @@ public void ShouldNotFireNextWhenOnFirstPage()
     public void ShouldNotFireNextWhenNoPage()
     {
         var page = CreatePagedList(0, 0);
-        var cut = RenderComponent<BlogPostNavigation<BlogPost>>(p =>
+        var cut = Render<BlogPostNavigation<BlogPost>>(p =>
             p.Add(param => param.PageList, page));
 
         cut.Find("li:first-child").ClassList.Should().Contain("disabled");
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/FooterTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/FooterTests.cs
index db1df6bb..62de52f6 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/FooterTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/FooterTests.cs
@@ -6,7 +6,7 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.Home.Components;
 
-public class FooterTests : TestContext
+public class FooterTests : BunitContext
 {
     [Fact]
     public void ShouldSetCopyrightInformation()
@@ -23,7 +23,7 @@ public void ShouldSetCopyrightInformation()
         });
         Services.AddScoped(_ => appConfig);
         
-        var cut = RenderComponent<Footer>();
+        var cut = Render<Footer>();
 
         cut.Find("span").TextContent.Should().Contain("Steven");
     }
@@ -34,7 +34,7 @@ public void ShouldNotSetNameIfAboutMeIsNotEnabled()
         var appConfig = new ApplicationConfiguration();
         Services.AddScoped(_ => Options.Create(appConfig));
 
-        var cut = RenderComponent<Footer>();
+        var cut = Render<Footer>();
 
         cut.Find("span").TextContent.Should().Contain("©");
     }
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/IntroductionCardTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/IntroductionCardTests.cs
index d156ffa9..1da0c497 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/IntroductionCardTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/IntroductionCardTests.cs
@@ -7,7 +7,7 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.Home.Components;
 
-public class IntroductionCardTests : TestContext
+public class IntroductionCardTests : BunitContext
 {
     [Fact]
     public void ShouldSetBackgroundWhenSet()
@@ -19,7 +19,7 @@ public void ShouldSetBackgroundWhenSet()
         
         Services.AddScoped(_ => Options.Create(introduction));
 
-        var cut = RenderComponent<IntroductionCard>();
+        var cut = Render<IntroductionCard>();
 
         var background = cut.FindAll(".introduction-background");
         background.Should().NotBeNullOrEmpty();
@@ -39,7 +39,7 @@ public void ShouldNotSetBackgroundWhenNotSet(string url)
 
         Services.AddScoped(_ => Options.Create(introduction));
 
-        var cut = RenderComponent<IntroductionCard>();
+        var cut = Render<IntroductionCard>();
 
         var background = cut.FindAll(".introduction-background");
         background.Should().BeNullOrEmpty();
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/SearchInputTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/SearchInputTests.cs
index 1b591b3d..34500876 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/SearchInputTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/SearchInputTests.cs
@@ -2,13 +2,13 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.Home.Components;
 
-public class SearchInputTests : TestContext
+public class SearchInputTests : BunitContext
 {
     [Fact]
     public void ShouldReturnEnteredText()
     {
         var enteredString = string.Empty;
-        var cut = RenderComponent<SearchInput>(p => p.Add(s => s.SearchEntered, s => enteredString = s));
+        var cut = Render<SearchInput>(p => p.Add(s => s.SearchEntered, s => enteredString = s));
         cut.Find("input").Change("Test");
 
         cut.Find("button").Click();
@@ -23,7 +23,7 @@ public void ShouldReturnEnteredText()
     public void ShouldNotReturnValueWhenOnlyWhitespaces(string input)
     {
         var wasInvoked = false;
-        var cut = RenderComponent<SearchInput>(p => p.Add(s => s.SearchEntered, _ => wasInvoked = true));
+        var cut = Render<SearchInput>(p => p.Add(s => s.SearchEntered, _ => wasInvoked = true));
         cut.Find("input").Change(input);
 
         cut.Find("button").Click();
@@ -35,7 +35,7 @@ public void ShouldNotReturnValueWhenOnlyWhitespaces(string input)
     public void ShouldTrimData()
     {
         var enteredString = string.Empty;
-        var cut = RenderComponent<SearchInput>(p => p.Add(s => s.SearchEntered, s => enteredString = s));
+        var cut = Render<SearchInput>(p => p.Add(s => s.SearchEntered, s => enteredString = s));
         cut.Find("input").Change("   Test 1 ");
 
         cut.Find("button").Click();
@@ -50,7 +50,7 @@ public void ShouldTrimData()
     public void ShouldReturnValueWhenEnterWasPressed(string key, bool expectedInvoke)
     {
         var wasInvoked = false;
-        var cut = RenderComponent<SearchInput>(p => p.Add(s => s.SearchEntered, _ => wasInvoked = true));
+        var cut = Render<SearchInput>(p => p.Add(s => s.SearchEntered, _ => wasInvoked = true));
         cut.Find("input").Change("Text");
 
         cut.Find("input").KeyUp(Key.Get(key));
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/SocialAccountTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/SocialAccountTests.cs
index b72f789b..cc60b6e6 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/SocialAccountTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/SocialAccountTests.cs
@@ -4,7 +4,7 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.Home.Components;
 
-public class SocialAccountTests : TestContext
+public class SocialAccountTests : BunitContext
 {
     [Theory]
     [InlineData(null, null, null, false, false, false)]
@@ -26,7 +26,7 @@ public void ShouldDisplayGithubAndLinkedInPageWhenOnlyWhenSet(
             TwitterAccountUrl = twitter,
         };
 
-        var cut = RenderComponent<SocialAccounts>(s => s.Add(p => p.Social, social));
+        var cut = Render<SocialAccounts>(s => s.Add(p => p.Social, social));
 
         cut.FindAll("#github").Any().Should().Be(githubAvailable);
         cut.FindAll("#linkedin").Any().Should().Be(linkedinAvailable);
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Services/UserRecordServiceTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Services/UserRecordServiceTests.cs
index ec5baa9d..08fc79d1 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Services/UserRecordServiceTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Services/UserRecordServiceTests.cs
@@ -7,18 +7,18 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.Services;
 
-public class UserRecordServiceTests : TestContext
+public class UserRecordServiceTests : BunitContext
 {
     private readonly IRepository<UserRecord> repositoryMock;
-    private readonly FakeNavigationManager fakeNavigationManager;
-    private readonly FakeAuthenticationStateProvider fakeAuthenticationStateProvider;
+    private readonly BunitNavigationManager fakeNavigationManager;
+    private readonly BunitAuthenticationStateProvider fakeAuthenticationStateProvider;
     private readonly UserRecordService sut;
 
     public UserRecordServiceTests()
     {
         repositoryMock = Substitute.For<IRepository<UserRecord>>();
-        fakeNavigationManager = new FakeNavigationManager(Renderer);
-        fakeAuthenticationStateProvider = new FakeAuthenticationStateProvider();
+        fakeNavigationManager = new BunitNavigationManager(this);
+        fakeAuthenticationStateProvider = new BunitAuthenticationStateProvider();
         sut = new UserRecordService(
             repositoryMock,
             fakeNavigationManager,
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/CommentSectionTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/CommentSectionTests.cs
index 9ccbc7ef..11281d36 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/CommentSectionTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/CommentSectionTests.cs
@@ -5,7 +5,7 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.ShowBlogPost.Components;
 
-public class CommentSectionTests : TestContext
+public class CommentSectionTests : BunitContext
 {
     [Fact]
     public void ShouldShowDisqusWhenConfigured()
@@ -14,7 +14,7 @@ public void ShouldShowDisqusWhenConfigured()
         Services.AddScoped(_ => Options.Create(new DisqusConfiguration() ));
         JSInterop.Mode = JSRuntimeMode.Loose;
 
-        var cut = RenderComponent<CommentSection>();
+        var cut = Render<CommentSection>();
 
         cut.FindComponents<Disqus>().Should().NotBeEmpty();
     }
@@ -26,7 +26,7 @@ public void ShouldShowGiscusWhenConfigured()
         Services.AddScoped(_ => Options.Create(new GiscusConfiguration() ));
         JSInterop.Mode = JSRuntimeMode.Loose;
 
-        var cut = RenderComponent<CommentSection>();
+        var cut = Render<CommentSection>();
 
         cut.FindComponents<Giscus>().Should().NotBeEmpty();
     }
@@ -40,7 +40,7 @@ public void ShouldShowAlertWhenMultipleRegistered()
         Services.AddScoped(_ => Options.Create( new GiscusConfiguration()));
         JSInterop.Mode = JSRuntimeMode.Loose;
 
-        var cut = RenderComponent<CommentSection>();
+        var cut = Render<CommentSection>();
 
         cut.FindAll(".alert-danger").Should().NotBeEmpty();
     }
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/DisqusTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/DisqusTests.cs
index 7742ceb4..0a0965cd 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/DisqusTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/DisqusTests.cs
@@ -6,7 +6,7 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.ShowBlogPost.Components;
 
-public class DisqusTests : TestContext
+public class DisqusTests : BunitContext
 {
     [Fact]
     public void ShouldLoadJavascript()
@@ -20,7 +20,7 @@ public void ShouldLoadJavascript()
         JSInterop.SetupModule("./Features/ShowBlogPost/Components/Disqus.razor.js");
         JSInterop.Mode = JSRuntimeMode.Loose;
 
-        RenderComponent<Disqus>();
+        Render<Disqus>();
 
         var init = JSInterop.Invocations.SingleOrDefault(i => i.Identifier == "initDisqus");
         init.Should().NotBeNull();
@@ -32,7 +32,7 @@ public void ShouldNotInitDisqusWhenNoInformationProvided()
     {
         Services.AddScoped(_ => Options.Create(new ApplicationConfiguration()));
 
-        RenderComponent<Disqus>();
+        Render<Disqus>();
 
         JSInterop.Invocations.Should().BeEmpty();
     }
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/DonationSectionTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/DonationSectionTests.cs
index 7564aae5..431b9f25 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/DonationSectionTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/DonationSectionTests.cs
@@ -5,7 +5,7 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.ShowBlogPost.Components;
 
-public class DonationSectionTests : TestContext
+public class DonationSectionTests : BunitContext
 {
     [Theory]
     [InlineData("linkdotnet", true)]
@@ -19,7 +19,7 @@ public void ShouldShowKofiIfSet(string token, bool hasComponent)
         };
         Services.AddScoped(_ => Options.Create(appConfig));
 
-        var cut = RenderComponent<DonationSection>();
+        var cut = Render<DonationSection>();
 
         cut.HasComponent<Kofi>().Should().Be(hasComponent);
     }
@@ -36,7 +36,7 @@ public void ShouldShowGithubSponsorIfSet(string account, bool hasComponent)
         };
         Services.AddScoped(_ =>Options.Create(appConfig));
 
-        var cut = RenderComponent<DonationSection>();
+        var cut = Render<DonationSection>();
 
         cut.HasComponent<GithubSponsor>().Should().Be(hasComponent);
     }
@@ -52,7 +52,7 @@ public void ShouldShowPatreonSponsorIfSet(string account, bool hasComponent)
         };
         Services.AddScoped(_ => Options.Create(appConfig));
 
-        var cut = RenderComponent<DonationSection>();
+        var cut = Render<DonationSection>();
 
         cut.HasComponent<Patreon>().Should().Be(hasComponent);
     }
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/GiscusTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/GiscusTests.cs
index b30daf89..27b8b934 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/GiscusTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/GiscusTests.cs
@@ -6,7 +6,7 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.ShowBlogPost.Components;
 
-public class GiscusTests : TestContext
+public class GiscusTests : BunitContext
 {
     [Fact]
     public void ShouldLoadJavascript()
@@ -23,7 +23,7 @@ public void ShouldLoadJavascript()
         JSInterop.SetupModule("./Features/ShowBlogPost/Components/Giscus.razor.js");
         JSInterop.Mode = JSRuntimeMode.Loose;
 
-        RenderComponent<Giscus>();
+        Render<Giscus>();
 
         var init = JSInterop.Invocations.SingleOrDefault(i => i.Identifier == "initGiscus");
         init.Should().NotBeNull();
@@ -36,7 +36,7 @@ public void ShouldNotInitGiscusWhenNoInformationProvided()
     {
         Services.AddScoped(_ => Options.Create(new ApplicationConfiguration()));
 
-        RenderComponent<Giscus>();
+        Render<Giscus>();
 
         JSInterop.Invocations.Should().BeEmpty();
     }
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/GithubSponsorTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/GithubSponsorTests.cs
index b060fff7..2d5b0b90 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/GithubSponsorTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/GithubSponsorTests.cs
@@ -3,12 +3,12 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.ShowBlogPost.Components;
 
-public class GithubSponsorTests : TestContext
+public class GithubSponsorTests : BunitContext
 {
     [Fact]
     public void ShouldSetUrlCorrect()
     {
-        var cut = RenderComponent<GithubSponsor>(
+        var cut = Render<GithubSponsor>(
             p => p.Add(g => g.Name, "linkdotnet"));
 
         var anchor = cut.Find("a") as IHtmlAnchorElement;
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/KofiTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/KofiTests.cs
index 4726695b..18f8a5b1 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/KofiTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/KofiTests.cs
@@ -3,12 +3,12 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.ShowBlogPost.Components;
 
-public class KofiTests : TestContext
+public class KofiTests : BunitContext
 {
     [Fact]
     public void ShouldSetToken()
     {
-        var cut = RenderComponent<Kofi>(p => p.Add(s => s.KofiToken, "Token"));
+        var cut = Render<Kofi>(p => p.Add(s => s.KofiToken, "Token"));
 
         ((IHtmlAnchorElement)cut.Find("a")).Href.Should().Contain("https://ko-fi.com/Token");
     }
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/LikeTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/LikeTests.cs
index b2cc87c3..6ff5555d 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/LikeTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/LikeTests.cs
@@ -6,14 +6,14 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.ShowBlogPost.Components;
 
-public class LikeTests : TestContext
+public class LikeTests : BunitContext
 {
     [Fact]
     public void ShouldDisplayLikes()
     {
         Services.AddScoped(_ => Substitute.For<ILocalStorageService>());
         var blogPost = new BlogPostBuilder().WithLikes(1).Build();
-        var cut = RenderComponent<Like>(
+        var cut = Render<Like>(
             p => p.Add(l => l.BlogPost, blogPost));
 
         var label = cut.Find("div").TextContent;
@@ -28,7 +28,7 @@ public void ShouldInvokeEventWhenButtonClicked()
         var blogPost = new BlogPostBuilder().Build();
         var wasClicked = false;
         var wasLike = false;
-        var cut = RenderComponent<Like>(
+        var cut = Render<Like>(
             p => p.Add(l => l.BlogPost, blogPost)
                 .Add(l => l.OnBlogPostLiked, b =>
                 {
@@ -49,7 +49,7 @@ public async Task ShouldSetLocalStorageVariableOnClick()
         Services.AddScoped(_ => localStorage);
         var blogPost = new BlogPostBuilder().Build();
         blogPost.Id = "id";
-        var cut = RenderComponent<Like>(
+        var cut = Render<Like>(
             p => p.Add(l => l.BlogPost, blogPost));
 
         cut.Find("span").Click();
@@ -67,7 +67,7 @@ public void ShouldCheckLocalStorageOnInit()
         var blogPost = new BlogPostBuilder().Build();
         blogPost.Id = "id";
         var wasLike = true;
-        var cut = RenderComponent<Like>(
+        var cut = Render<Like>(
             p => p.Add(l => l.BlogPost, blogPost)
                 .Add(l => l.OnBlogPostLiked, b => wasLike = b));
 
@@ -84,7 +84,7 @@ public void ShouldCheckStorageOnClickAgainAndDoNothingOnMismatch()
         var blogPost = new BlogPostBuilder().Build();
         blogPost.Id = "id";
         var wasClicked = false;
-        var cut = RenderComponent<Like>(
+        var cut = Render<Like>(
             p => p.Add(l => l.BlogPost, blogPost)
                 .Add(l => l.OnBlogPostLiked, _ => wasClicked = true));
         localStorage.ContainKeyAsync("hasLiked/id").Returns(true);
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/PatreonTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/PatreonTests.cs
index 9095b222..1c4838d6 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/PatreonTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/PatreonTests.cs
@@ -3,12 +3,12 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.ShowBlogPost.Components;
 
-public class PatreonTests : TestContext
+public class PatreonTests : BunitContext
 {
     [Fact]
     public void ShouldSetUrlCorrect()
     {
-        var cut = RenderComponent<Patreon>(
+        var cut = Render<Patreon>(
             p => p.Add(s => s.PatreonName, "linkdotnet"));
 
         var anchor = cut.Find("a") as IHtmlAnchorElement;
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/ShareBlogPostTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/ShareBlogPostTests.cs
index 44f3cc3c..2469df22 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/ShareBlogPostTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/ShareBlogPostTests.cs
@@ -6,13 +6,13 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.ShowBlogPost.Components;
 
-public class ShareBlogPostTests : TestContext
+public class ShareBlogPostTests : BunitContext
 {
     [Fact]
     public void ShouldCopyLinkToClipboard()
     {
-        Services.GetRequiredService<FakeNavigationManager>().NavigateTo("blogPost/1");
-        var cut = RenderComponent<ShareBlogPost>();
+        Services.GetRequiredService<BunitNavigationManager>().NavigateTo("blogPost/1");
+        var cut = Render<ShareBlogPost>();
 
         var element = cut.Find("#share-clipboard") as IHtmlAnchorElement;
 
@@ -25,9 +25,9 @@ public void ShouldCopyLinkToClipboard()
     [Fact]
     public void ShouldShareToLinkedIn()
     {
-        Services.GetRequiredService<FakeNavigationManager>().NavigateTo("blogPost/1");
+        Services.GetRequiredService<BunitNavigationManager>().NavigateTo("blogPost/1");
 
-        var cut = RenderComponent<ShareBlogPost>();
+        var cut = Render<ShareBlogPost>();
 
         var linkedInShare = (IHtmlAnchorElement)cut.Find("#share-linkedin");
         linkedInShare.Href.Should().Be("https://www.linkedin.com/shareArticle?mini=true&url=http://localhost/blogPost/1");
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/StructuredDataTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/StructuredDataTests.cs
index 10dc460f..ff6cd359 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/StructuredDataTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/StructuredDataTests.cs
@@ -2,12 +2,12 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.ShowBlogPost.Components;
 
-public class StructuredDataTests : TestContext
+public class StructuredDataTests : BunitContext
 {
     [Fact]
     public void ShouldRenderRawMarkup()
     {
-        var cut = RenderComponent<StructuredData>(
+        var cut = Render<StructuredData>(
             ps => ps.Add(p => p.Author, "Steven")
                 .Add(p => p.Headline, "Headline")
                 .Add(p => p.PreviewImage, "url1")
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/ShowBlogPostPageTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/ShowBlogPostPageTests.cs
index 3f162c86..09601d11 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/ShowBlogPostPageTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/ShowBlogPostPageTests.cs
@@ -15,7 +15,7 @@
 
 namespace LinkDotNet.Blog.UnitTests.Web.Features.ShowBlogPost;
 
-public class ShowBlogPostPageTests : TestContext
+public class ShowBlogPostPageTests : BunitContext
 {
     [Fact]
     public void ShouldShowLoadingAnimation()
@@ -32,7 +32,7 @@ public void ShouldShowLoadingAnimation()
             })));
 
 
-        var cut = RenderComponent<ShowBlogPostPage>(
+        var cut = Render<ShowBlogPostPage>(
             p => p.Add(s => s.BlogPostId, blogPostId));
 
         cut.FindComponents<Loading>().Count.Should().Be(1);
@@ -47,7 +47,7 @@ public void ShouldSetTitleToTag()
         Services.AddScoped(_ => repositoryMock);
         SetupMocks();
 
-        var cut = RenderComponent<ShowBlogPostPage>(
+        var cut = Render<ShowBlogPostPage>(
             p => p.Add(s => s.BlogPostId, "1"));
 
         var pageTitleStub = cut.FindComponent<PageTitleStub>();
@@ -69,7 +69,7 @@ public void ShouldUseFallbackAsOgDataIfAvailable(string preview, string fallback
         Services.AddScoped(_ => repositoryMock);
         SetupMocks();
 
-        var cut = RenderComponent<ShowBlogPostPage>(
+        var cut = Render<ShowBlogPostPage>(
             p => p.Add(s => s.BlogPostId, "1"));
 
         cut.FindComponent<OgData>().Instance.AbsolutePreviewImageUrl.Should().Be(expected);
@@ -86,7 +86,7 @@ public void ShowTagWithLinksWhenAvailable()
         Services.AddScoped(_ => repositoryMock);
         SetupMocks();
 
-        var cut = RenderComponent<ShowBlogPostPage>(
+        var cut = Render<ShowBlogPostPage>(
             p => p.Add(s => s.BlogPostId, "1"));
 
         var aElement = cut.Find(".goto-tag") as IHtmlAnchorElement;
@@ -104,7 +104,7 @@ public void ShowNotShowTagsWhenNotSet()
         Services.AddScoped(_ => repositoryMock);
         SetupMocks();
 
-        var cut = RenderComponent<ShowBlogPostPage>(
+        var cut = Render<ShowBlogPostPage>(
             p => p.Add(s => s.BlogPostId, "1"));
 
         cut.FindAll(".goto-tag").Should().BeEmpty();
@@ -127,7 +127,7 @@ public void ShowReadingIndicatorWhenEnabled(bool isEnabled)
         SetupMocks();
         Services.AddScoped(_ => Options.Create(appConfiguration));
 
-        var cut = RenderComponent<ShowBlogPostPage>(
+        var cut = Render<ShowBlogPostPage>(
             p => p.Add(s => s.BlogPostId, "1"));
 
         cut.HasComponent<ReadingIndicator>().Should().Be(isEnabled);
@@ -145,7 +145,7 @@ public void ShouldSetCanoncialUrlOfOgDataWithoutSlug()
         Services.AddScoped(_ => repositoryMock);
         SetupMocks();
         
-        var cut = RenderComponent<ShowBlogPostPage>(
+        var cut = Render<ShowBlogPostPage>(
             p => p.Add(s => s.BlogPostId, "1"));
         
         cut.FindComponent<OgData>().Instance.CanonicalRelativeUrl.Should().Be("blogPost/1");
@@ -157,7 +157,7 @@ private void SetupMocks()
         Services.AddScoped(_ => Substitute.For<IUserRecordService>());
         Services.AddScoped(_ => Substitute.For<IToastService>());
         Services.AddScoped(_ => Options.Create(new ApplicationConfiguration()));
-        this.AddTestAuthorization();
+        this.AddAuthorization();
         ComponentFactories.AddStub<PageTitle>();
         ComponentFactories.AddStub<Like>();
         ComponentFactories.AddStub<CommentSection>();