diff --git a/src/LinkDotNet.Blog.Domain/Enumeration.cs b/src/LinkDotNet.Blog.Domain/Enumeration.cs
index 6c55cf18..aac8ca51 100644
--- a/src/LinkDotNet.Blog.Domain/Enumeration.cs
+++ b/src/LinkDotNet.Blog.Domain/Enumeration.cs
@@ -25,19 +25,9 @@ protected Enumeration(string key)
     public string Key { get; }
 
     public static bool operator ==(Enumeration<TEnumeration> a, Enumeration<TEnumeration> b)
-    {
-        if (a is null || b is null)
-        {
-            return false;
-        }
-
-        return a.Key.Equals(b.Key, StringComparison.Ordinal);
-    }
+        => a is not null && b is not null && a.Key.Equals(b.Key, StringComparison.Ordinal);
 
-    public static bool operator !=(Enumeration<TEnumeration> a, Enumeration<TEnumeration> b)
-    {
-        return !(a == b);
-    }
+    public static bool operator !=(Enumeration<TEnumeration> a, Enumeration<TEnumeration> b) => !(a == b);
 
     public static TEnumeration Create(string key)
         => All.SingleOrDefault(p => p.Key == key)
@@ -45,15 +35,7 @@ public static TEnumeration Create(string key)
 
     public override int GetHashCode() => Key.GetHashCode(StringComparison.Ordinal);
 
-    public override bool Equals(object obj)
-    {
-        if (obj?.GetType() != typeof(TEnumeration))
-        {
-            return false;
-        }
-
-        return ((TEnumeration)obj).Key == Key;
-    }
+    public override bool Equals(object obj) => obj?.GetType() == typeof(TEnumeration) && ((TEnumeration)obj).Key == Key;
 
     public override string ToString() => Key;
 
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 9499f6ca..1b5ba401 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
@@ -7,7 +7,6 @@
 using LinkDotNet.Blog.Infrastructure.Persistence.Sql;
 using LinkDotNet.Blog.TestUtilities;
 using LinkDotNet.Blog.Web.Features.Admin.Dashboard.Components;
-using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
@@ -55,12 +54,12 @@ public async Task ShouldFilterByDate()
         await DbContext.BlogPostRecords.AddRangeAsync(clicked1, clicked2, clicked3, clicked4);
         await DbContext.SaveChangesAsync();
         using var ctx = new TestContext();
-        ctx.ComponentFactories.Add<DateRangeSelector, FilterStubComponent>();
+        ctx.ComponentFactories.AddStub<DateRangeSelector>();
         RegisterRepositories(ctx);
         var cut = ctx.RenderComponent<VisitCountPerPage>();
         var filter = new Filter { StartDate = new DateOnly(2019, 1, 1), EndDate = new DateOnly(2020, 12, 31) };
 
-        await cut.InvokeAsync(() => cut.FindComponent<FilterStubComponent>().Instance.FireFilterChanged(filter));
+        await cut.InvokeAsync(() => cut.FindComponent<DateRangeSelectorStub>().Instance.FilterChanged.InvokeAsync(filter));
 
         cut.WaitForState(() => cut.FindAll("td").Any());
         var elements = cut.FindAll("td").ToList();
@@ -116,12 +115,4 @@ private async Task SaveBlogPostArticleClicked(string blogPostId, int count)
 
         await DbContext.SaveChangesAsync();
     }
-
-    private sealed class FilterStubComponent : ComponentBase
-    {
-        [Parameter]
-        public EventCallback<Filter> FilterChanged { get; set; }
-
-        public void FireFilterChanged(Filter filter) => FilterChanged.InvokeAsync(filter);
-    }
-}
+}
\ No newline at end of file