diff --git a/Directory.Packages.props b/Directory.Packages.props
index 36b95d02..e8453faa 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -30,8 +30,8 @@
     <PackageVersion Include="NUnit3TestAdapter" Version="5.1.0" />
     <PackageVersion Include="NUnit.Analyzers" Version="4.10.0" />
     <PackageVersion Include="PublicApiGenerator" Version="11.4.6" />
-    <PackageVersion Include="TUnit" Version="0.25.21" />
-    <PackageVersion Include="TUnit.Core" Version="0.56.5" />
+    <PackageVersion Include="TUnit" Version="0.56.44" />
+    <PackageVersion Include="TUnit.Core" Version="0.56.44" />
     <PackageVersion Include="Verify.MSTest" Version="30.7.2" />
     <PackageVersion Include="Verify.NUnit" Version="30.7.2" />
     <PackageVersion Include="Verify.TUnit" Version="30.7.2" />
diff --git a/src/NetEvolve.Extensions.TUnit/Internal/CategoryTraitBaseAttribute.cs b/src/NetEvolve.Extensions.TUnit/Internal/CategoryTraitBaseAttribute.cs
index 407cf6a9..744cac87 100644
--- a/src/NetEvolve.Extensions.TUnit/Internal/CategoryTraitBaseAttribute.cs
+++ b/src/NetEvolve.Extensions.TUnit/Internal/CategoryTraitBaseAttribute.cs
@@ -1,6 +1,7 @@
 namespace NetEvolve.Extensions.TUnit.Internal;
 
 using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
 using global::TUnit.Core.Interfaces;
 
 /// <summary>
@@ -15,6 +16,9 @@ public abstract class CategoryTraitBaseAttribute : Attribute, ITestDiscoveryEven
     /// </summary>
     public string Category { get; }
 
+    /// <inheritdoc cref="IEventReceiver.Order" />
+    public int Order => 0;
+
     /// <summary>
     /// Initializes a new instance of the <see cref="CategoryTraitBaseAttribute"/> class.
     /// </summary>
@@ -22,13 +26,15 @@ public abstract class CategoryTraitBaseAttribute : Attribute, ITestDiscoveryEven
     protected CategoryTraitBaseAttribute(string category) => Category = category;
 
     /// <inheritdoc/>
-    public void OnTestDiscovery(DiscoveredTestContext discoveredTestContext)
+    public ValueTask OnTestDiscovered(DiscoveredTestContext context)
     {
-        if (discoveredTestContext is null)
+        if (context is null)
         {
-            return;
+            return ValueTask.CompletedTask;
         }
 
-        discoveredTestContext.AddCategory(Category);
+        context.AddCategory(Category);
+
+        return ValueTask.CompletedTask;
     }
 }
diff --git a/src/NetEvolve.Extensions.TUnit/Internal/CategoryWithIdTraitBaseAttribute.cs b/src/NetEvolve.Extensions.TUnit/Internal/CategoryWithIdTraitBaseAttribute.cs
index e105d434..a6dbe7bf 100644
--- a/src/NetEvolve.Extensions.TUnit/Internal/CategoryWithIdTraitBaseAttribute.cs
+++ b/src/NetEvolve.Extensions.TUnit/Internal/CategoryWithIdTraitBaseAttribute.cs
@@ -1,5 +1,7 @@
 namespace NetEvolve.Extensions.TUnit.Internal;
 
+using System.Threading.Tasks;
+using global::TUnit.Core;
 using global::TUnit.Core.Interfaces;
 
 /// <summary>
@@ -31,6 +33,9 @@ public abstract class CategoryWithIdTraitBaseAttribute : Attribute, ITestDiscove
     /// </summary>
     public string? Id { get; }
 
+    /// <inheritdoc cref="IEventReceiver.Order" />
+    public int Order => 0;
+
     /// <summary>
     /// Initializes a new instance of the <see cref="CategoryWithIdTraitBaseAttribute"/> class.
     /// </summary>
@@ -54,17 +59,19 @@ protected CategoryWithIdTraitBaseAttribute(string category, long id)
     }
 
     /// <inheritdoc/>
-    public void OnTestDiscovery(DiscoveredTestContext discoveredTestContext)
+    public ValueTask OnTestDiscovered(DiscoveredTestContext context)
     {
-        if (discoveredTestContext is null)
+        if (context is null)
         {
-            return;
+            return ValueTask.CompletedTask;
         }
 
-        discoveredTestContext.AddCategory(Category);
+        context.AddCategory(Category);
         if (!string.IsNullOrWhiteSpace(Id))
         {
-            discoveredTestContext.AddProperty(Category, Id);
+            context.AddProperty(Category, Id);
         }
+
+        return ValueTask.CompletedTask;
     }
 }
diff --git a/src/NetEvolve.Extensions.TUnit/Internal/NamedCategoryTraitBaseAttribute.cs b/src/NetEvolve.Extensions.TUnit/Internal/NamedCategoryTraitBaseAttribute.cs
index 4c48649c..3b4c5ea1 100644
--- a/src/NetEvolve.Extensions.TUnit/Internal/NamedCategoryTraitBaseAttribute.cs
+++ b/src/NetEvolve.Extensions.TUnit/Internal/NamedCategoryTraitBaseAttribute.cs
@@ -17,6 +17,9 @@ public abstract class NamedCategoryTraitBaseAttribute : Attribute, ITestDiscover
     /// </summary>
     public string Id { get; }
 
+    /// <inheritdoc cref="IEventReceiver.Order" />
+    public int Order => 0;
+
     /// <summary>
     /// Initializes a new instance of the <see cref="NamedCategoryTraitBaseAttribute"/> class.
     /// </summary>
@@ -29,16 +32,18 @@ protected NamedCategoryTraitBaseAttribute(string category, string id)
     }
 
     /// <inheritdoc/>
-    public void OnTestDiscovery(DiscoveredTestContext discoveredTestContext)
+    public ValueTask OnTestDiscovered(DiscoveredTestContext context)
     {
-        if (discoveredTestContext is null)
+        if (context is null)
         {
-            return;
+            return ValueTask.CompletedTask;
         }
 
         if (!string.IsNullOrWhiteSpace(Id))
         {
-            discoveredTestContext.AddProperty(Category, Id);
+            context.AddProperty(Category, Id);
         }
+
+        return ValueTask.CompletedTask;
     }
 }
diff --git a/tests/NetEvolve.Extensions.MSTest.Tests.PublicApi/Predefined.cs b/tests/NetEvolve.Extensions.MSTest.Tests.PublicApi/Predefined.cs
index fdaa8f44..e1b76a3d 100644
--- a/tests/NetEvolve.Extensions.MSTest.Tests.PublicApi/Predefined.cs
+++ b/tests/NetEvolve.Extensions.MSTest.Tests.PublicApi/Predefined.cs
@@ -11,7 +11,7 @@ internal static class Predefined
     public static void Init()
     {
         Verifier.DerivePathInfo(
-            (sourceFile, projectDirectory, type, method) =>
+            (__, projectDirectory, type, method) =>
             {
                 var directory = Path.Combine(projectDirectory, "_snapshots", Namer.TargetFrameworkNameAndVersion);
                 _ = Directory.CreateDirectory(directory);
diff --git a/tests/NetEvolve.Extensions.MSTest.Tests.Unit/Predefined.cs b/tests/NetEvolve.Extensions.MSTest.Tests.Unit/Predefined.cs
index 4b296ccb..ec9a2b82 100644
--- a/tests/NetEvolve.Extensions.MSTest.Tests.Unit/Predefined.cs
+++ b/tests/NetEvolve.Extensions.MSTest.Tests.Unit/Predefined.cs
@@ -11,7 +11,7 @@ internal static class Predefined
     public static void Init()
     {
         Verifier.DerivePathInfo(
-            (sourceFile, projectDirectory, type, method) =>
+            (__, projectDirectory, type, method) =>
             {
                 var directory = Path.Combine(projectDirectory, "..", "_snapshots", Namer.TargetFrameworkNameAndVersion);
                 _ = Directory.CreateDirectory(directory);
diff --git a/tests/NetEvolve.Extensions.NUnit.Tests.PublicApi/Predefined.cs b/tests/NetEvolve.Extensions.NUnit.Tests.PublicApi/Predefined.cs
index c5c58aaa..1b10c1b7 100644
--- a/tests/NetEvolve.Extensions.NUnit.Tests.PublicApi/Predefined.cs
+++ b/tests/NetEvolve.Extensions.NUnit.Tests.PublicApi/Predefined.cs
@@ -11,7 +11,7 @@ internal static class Predefined
     public static void Init()
     {
         Verifier.DerivePathInfo(
-            (sourceFile, projectDirectory, type, method) =>
+            (__, projectDirectory, type, method) =>
             {
                 var directory = Path.Combine(projectDirectory, "_snapshots", Namer.TargetFrameworkNameAndVersion);
                 _ = Directory.CreateDirectory(directory);
diff --git a/tests/NetEvolve.Extensions.NUnit.Tests.Unit/Predefined.cs b/tests/NetEvolve.Extensions.NUnit.Tests.Unit/Predefined.cs
index 455f1501..4eddc035 100644
--- a/tests/NetEvolve.Extensions.NUnit.Tests.Unit/Predefined.cs
+++ b/tests/NetEvolve.Extensions.NUnit.Tests.Unit/Predefined.cs
@@ -11,7 +11,7 @@ internal static class Predefined
     public static void Init()
     {
         Verifier.DerivePathInfo(
-            (sourceFile, projectDirectory, type, method) =>
+            (__, projectDirectory, type, method) =>
             {
                 var directory = Path.Combine(projectDirectory, "..", "_snapshots", Namer.TargetFrameworkNameAndVersion);
                 _ = Directory.CreateDirectory(directory);
diff --git a/tests/NetEvolve.Extensions.TUnit.Tests.PublicApi/Predefined.cs b/tests/NetEvolve.Extensions.TUnit.Tests.PublicApi/Predefined.cs
index b0fca3e2..da857d3e 100644
--- a/tests/NetEvolve.Extensions.TUnit.Tests.PublicApi/Predefined.cs
+++ b/tests/NetEvolve.Extensions.TUnit.Tests.PublicApi/Predefined.cs
@@ -11,7 +11,7 @@ internal static class Predefined
     public static void Init()
     {
         Verifier.DerivePathInfo(
-            (sourceFile, projectDirectory, type, method) =>
+            (__, projectDirectory, type, method) =>
             {
                 var directory = Path.Combine(projectDirectory, "_snapshots", Namer.TargetFrameworkNameAndVersion);
                 _ = Directory.CreateDirectory(directory);
diff --git a/tests/NetEvolve.Extensions.TUnit.Tests.PublicApi/_snapshots/DotNet8_0/PublicApiTests.PublicApi_HasNotChanged_Expected.verified.txt b/tests/NetEvolve.Extensions.TUnit.Tests.PublicApi/_snapshots/DotNet8_0/PublicApiTests.PublicApi_HasNotChanged_Expected.verified.txt
index 42756f56..c09ffa66 100644
--- a/tests/NetEvolve.Extensions.TUnit.Tests.PublicApi/_snapshots/DotNet8_0/PublicApiTests.PublicApi_HasNotChanged_Expected.verified.txt
+++ b/tests/NetEvolve.Extensions.TUnit.Tests.PublicApi/_snapshots/DotNet8_0/PublicApiTests.PublicApi_HasNotChanged_Expected.verified.txt
@@ -87,7 +87,8 @@ namespace NetEvolve.Extensions.TUnit.Internal
     {
         protected CategoryTraitBaseAttribute(string category) { }
         public string Category { get; }
-        public void OnTestDiscovery(TUnit.Core.DiscoveredTestContext discoveredTestContext) { }
+        public int Order { get; }
+        public System.Threading.Tasks.ValueTask OnTestDiscovered(TUnit.Core.DiscoveredTestContext context) { }
     }
     public abstract class CategoryWithIdTraitBaseAttribute : System.Attribute, TUnit.Core.Interfaces.IEventReceiver, TUnit.Core.Interfaces.ITestDiscoveryEventReceiver
     {
@@ -95,13 +96,53 @@ namespace NetEvolve.Extensions.TUnit.Internal
         protected CategoryWithIdTraitBaseAttribute(string category, string? id) { }
         public string Category { get; }
         public string? Id { get; }
-        public void OnTestDiscovery(TUnit.Core.DiscoveredTestContext discoveredTestContext) { }
+        public int Order { get; }
+        public System.Threading.Tasks.ValueTask OnTestDiscovered(TUnit.Core.DiscoveredTestContext context) { }
     }
     public abstract class NamedCategoryTraitBaseAttribute : System.Attribute, TUnit.Core.Interfaces.IEventReceiver, TUnit.Core.Interfaces.ITestDiscoveryEventReceiver
     {
         protected NamedCategoryTraitBaseAttribute(string category, string id) { }
         public string Category { get; }
         public string Id { get; }
-        public void OnTestDiscovery(TUnit.Core.DiscoveredTestContext discoveredTestContext) { }
+        public int Order { get; }
+        public System.Threading.Tasks.ValueTask OnTestDiscovered(TUnit.Core.DiscoveredTestContext context) { }
+    }
+}
+namespace TUnit.Core.Helpers
+{
+    public static class ReflectionReplacements
+    {
+        public static bool IsAotMode { get; }
+        public static object?[]? ConvertTupleToArray(object tuple) { }
+        public static System.Threading.Tasks.Task<object?> InvokeMethodAsync(string methodKey, object? instance, params object?[]? parameters) { }
+        public static bool IsTupleType(System.Type type) { }
+        public static System.Type? MakeGenericType(System.Type genericDefinition, params System.Type[] typeArguments) { }
+        public static void RegisterGenericTypeFactory(TUnit.Core.Helpers.ReflectionReplacements.GenericTypeFactoryDelegate genericTypeFactory) { }
+        public static void RegisterMethodInvoker(TUnit.Core.Helpers.ReflectionReplacements.MethodInvokerDelegate methodInvoker) { }
+        public static void RegisterPropertyInjector<T>(TUnit.Core.Helpers.ReflectionReplacements.PropertyInjectorDelegate<T> propertyInjector)
+            where T :  notnull { }
+        public static void RegisterTupleConverter(TUnit.Core.Helpers.ReflectionReplacements.TupleConverterDelegate tupleConverter) { }
+        public static void RegisterTupleTypeChecker(TUnit.Core.Helpers.ReflectionReplacements.TupleTypeCheckerDelegate tupleTypeChecker) { }
+        public static void RegisterTypeResolver(TUnit.Core.Helpers.ReflectionReplacements.TypeResolverDelegate typeResolver) { }
+        public static System.Type? ResolveType(string assemblyQualifiedName) { }
+        public delegate System.Type? GenericTypeFactoryDelegate(System.Type genericDefinition, System.Type[] typeArguments);
+        public delegate System.Threading.Tasks.Task<object?> MethodInvokerDelegate(string methodKey, object? instance, object?[]? parameters);
+        public delegate System.Threading.Tasks.Task PropertyInjectorDelegate<T>(T instance, System.Collections.Generic.Dictionary<string, object?> propertyValues, TUnit.Core.TestContext testContext);
+        public delegate object?[]? TupleConverterDelegate(object tuple);
+        public delegate bool TupleTypeCheckerDelegate(System.Type type);
+        public delegate System.Type? TypeResolverDelegate(string assemblyQualifiedName);
+    }
+}
+namespace TUnit.Generated
+{
+    public static class AotReplacementRegistry
+    {
+        [System.Runtime.CompilerServices.ModuleInitializer]
+        public static void Initialize() { }
+    }
+    public static class AotTypeResolver
+    {
+        public static System.Type? MakeGenericType(System.Type genericTypeDefinition, params System.Type[] typeArguments) { }
+        public static System.Type? ResolveType(string assemblyQualifiedName) { }
     }
 }
\ No newline at end of file
diff --git a/tests/NetEvolve.Extensions.TUnit.Tests.PublicApi/_snapshots/DotNet9_0/PublicApiTests.PublicApi_HasNotChanged_Expected.verified.txt b/tests/NetEvolve.Extensions.TUnit.Tests.PublicApi/_snapshots/DotNet9_0/PublicApiTests.PublicApi_HasNotChanged_Expected.verified.txt
index 42756f56..c09ffa66 100644
--- a/tests/NetEvolve.Extensions.TUnit.Tests.PublicApi/_snapshots/DotNet9_0/PublicApiTests.PublicApi_HasNotChanged_Expected.verified.txt
+++ b/tests/NetEvolve.Extensions.TUnit.Tests.PublicApi/_snapshots/DotNet9_0/PublicApiTests.PublicApi_HasNotChanged_Expected.verified.txt
@@ -87,7 +87,8 @@ namespace NetEvolve.Extensions.TUnit.Internal
     {
         protected CategoryTraitBaseAttribute(string category) { }
         public string Category { get; }
-        public void OnTestDiscovery(TUnit.Core.DiscoveredTestContext discoveredTestContext) { }
+        public int Order { get; }
+        public System.Threading.Tasks.ValueTask OnTestDiscovered(TUnit.Core.DiscoveredTestContext context) { }
     }
     public abstract class CategoryWithIdTraitBaseAttribute : System.Attribute, TUnit.Core.Interfaces.IEventReceiver, TUnit.Core.Interfaces.ITestDiscoveryEventReceiver
     {
@@ -95,13 +96,53 @@ namespace NetEvolve.Extensions.TUnit.Internal
         protected CategoryWithIdTraitBaseAttribute(string category, string? id) { }
         public string Category { get; }
         public string? Id { get; }
-        public void OnTestDiscovery(TUnit.Core.DiscoveredTestContext discoveredTestContext) { }
+        public int Order { get; }
+        public System.Threading.Tasks.ValueTask OnTestDiscovered(TUnit.Core.DiscoveredTestContext context) { }
     }
     public abstract class NamedCategoryTraitBaseAttribute : System.Attribute, TUnit.Core.Interfaces.IEventReceiver, TUnit.Core.Interfaces.ITestDiscoveryEventReceiver
     {
         protected NamedCategoryTraitBaseAttribute(string category, string id) { }
         public string Category { get; }
         public string Id { get; }
-        public void OnTestDiscovery(TUnit.Core.DiscoveredTestContext discoveredTestContext) { }
+        public int Order { get; }
+        public System.Threading.Tasks.ValueTask OnTestDiscovered(TUnit.Core.DiscoveredTestContext context) { }
+    }
+}
+namespace TUnit.Core.Helpers
+{
+    public static class ReflectionReplacements
+    {
+        public static bool IsAotMode { get; }
+        public static object?[]? ConvertTupleToArray(object tuple) { }
+        public static System.Threading.Tasks.Task<object?> InvokeMethodAsync(string methodKey, object? instance, params object?[]? parameters) { }
+        public static bool IsTupleType(System.Type type) { }
+        public static System.Type? MakeGenericType(System.Type genericDefinition, params System.Type[] typeArguments) { }
+        public static void RegisterGenericTypeFactory(TUnit.Core.Helpers.ReflectionReplacements.GenericTypeFactoryDelegate genericTypeFactory) { }
+        public static void RegisterMethodInvoker(TUnit.Core.Helpers.ReflectionReplacements.MethodInvokerDelegate methodInvoker) { }
+        public static void RegisterPropertyInjector<T>(TUnit.Core.Helpers.ReflectionReplacements.PropertyInjectorDelegate<T> propertyInjector)
+            where T :  notnull { }
+        public static void RegisterTupleConverter(TUnit.Core.Helpers.ReflectionReplacements.TupleConverterDelegate tupleConverter) { }
+        public static void RegisterTupleTypeChecker(TUnit.Core.Helpers.ReflectionReplacements.TupleTypeCheckerDelegate tupleTypeChecker) { }
+        public static void RegisterTypeResolver(TUnit.Core.Helpers.ReflectionReplacements.TypeResolverDelegate typeResolver) { }
+        public static System.Type? ResolveType(string assemblyQualifiedName) { }
+        public delegate System.Type? GenericTypeFactoryDelegate(System.Type genericDefinition, System.Type[] typeArguments);
+        public delegate System.Threading.Tasks.Task<object?> MethodInvokerDelegate(string methodKey, object? instance, object?[]? parameters);
+        public delegate System.Threading.Tasks.Task PropertyInjectorDelegate<T>(T instance, System.Collections.Generic.Dictionary<string, object?> propertyValues, TUnit.Core.TestContext testContext);
+        public delegate object?[]? TupleConverterDelegate(object tuple);
+        public delegate bool TupleTypeCheckerDelegate(System.Type type);
+        public delegate System.Type? TypeResolverDelegate(string assemblyQualifiedName);
+    }
+}
+namespace TUnit.Generated
+{
+    public static class AotReplacementRegistry
+    {
+        [System.Runtime.CompilerServices.ModuleInitializer]
+        public static void Initialize() { }
+    }
+    public static class AotTypeResolver
+    {
+        public static System.Type? MakeGenericType(System.Type genericTypeDefinition, params System.Type[] typeArguments) { }
+        public static System.Type? ResolveType(string assemblyQualifiedName) { }
     }
 }
\ No newline at end of file
diff --git a/tests/NetEvolve.Extensions.TUnit.Tests.Unit/AttributeTestsBase.cs b/tests/NetEvolve.Extensions.TUnit.Tests.Unit/AttributeTestsBase.cs
index aa1ebdf4..b2eeebc6 100644
--- a/tests/NetEvolve.Extensions.TUnit.Tests.Unit/AttributeTestsBase.cs
+++ b/tests/NetEvolve.Extensions.TUnit.Tests.Unit/AttributeTestsBase.cs
@@ -19,7 +19,7 @@ protected static IEnumerable<KeyValuePair<string, string>> GetTraits([CallerMemb
 
         var context = TestContext.Current;
 
-        return GetCategories(context).Union(GetProperties(context)).Distinct().ToList();
+        return [.. GetCategories(context).Union(GetProperties(context)).Distinct()];
     }
 
     private static IEnumerable<KeyValuePair<string, string>> GetCategories(TestContext context) =>
diff --git a/tests/NetEvolve.Extensions.TUnit.Tests.Unit/Predefined.cs b/tests/NetEvolve.Extensions.TUnit.Tests.Unit/Predefined.cs
index 877ebb31..4821a3e6 100644
--- a/tests/NetEvolve.Extensions.TUnit.Tests.Unit/Predefined.cs
+++ b/tests/NetEvolve.Extensions.TUnit.Tests.Unit/Predefined.cs
@@ -11,7 +11,7 @@ internal static class Predefined
     public static void Init()
     {
         Verifier.DerivePathInfo(
-            (sourceFile, projectDirectory, type, method) =>
+            (__, projectDirectory, type, method) =>
             {
                 var directory = Path.Combine(projectDirectory, "..", "_snapshots", Namer.TargetFrameworkNameAndVersion);
                 _ = Directory.CreateDirectory(directory);
diff --git a/tests/NetEvolve.Extensions.XUnit.Tests.PublicApi/Predefined.cs b/tests/NetEvolve.Extensions.XUnit.Tests.PublicApi/Predefined.cs
index 1ed317f8..0b217f67 100644
--- a/tests/NetEvolve.Extensions.XUnit.Tests.PublicApi/Predefined.cs
+++ b/tests/NetEvolve.Extensions.XUnit.Tests.PublicApi/Predefined.cs
@@ -11,7 +11,7 @@ internal static class Predefined
     public static void Init()
     {
         Verifier.DerivePathInfo(
-            (sourceFile, projectDirectory, type, method) =>
+            (__, projectDirectory, type, method) =>
             {
                 var directory = Path.Combine(projectDirectory, "_snapshots", Namer.TargetFrameworkNameAndVersion);
                 _ = Directory.CreateDirectory(directory);
diff --git a/tests/NetEvolve.Extensions.XUnit.Tests.Unit/AttributeTestsBase.cs b/tests/NetEvolve.Extensions.XUnit.Tests.Unit/AttributeTestsBase.cs
index 7bc1a33e..50144163 100644
--- a/tests/NetEvolve.Extensions.XUnit.Tests.Unit/AttributeTestsBase.cs
+++ b/tests/NetEvolve.Extensions.XUnit.Tests.Unit/AttributeTestsBase.cs
@@ -40,15 +40,17 @@ protected IEnumerable<KeyValuePair<string, string>> GetTraits([CallerMemberName]
         }
 
         var messageSink = new NullMessageSink();
-        return GetTraits(methodInfo.CustomAttributes, messageSink)
-            .Union(GetTraits(classType.CustomAttributes, messageSink))
-            .Union(GetTraits(classType.Assembly.CustomAttributes, messageSink))
-            .Distinct()
-            .Where(kvp =>
-                !kvp.Key.Equals("TestGroup", StringComparison.OrdinalIgnoreCase)
-                && !kvp.Value.Equals("TestGroup", StringComparison.OrdinalIgnoreCase)
-            )
-            .ToList();
+        return
+        [
+            .. GetTraits(methodInfo.CustomAttributes, messageSink)
+                .Union(GetTraits(classType.CustomAttributes, messageSink))
+                .Union(GetTraits(classType.Assembly.CustomAttributes, messageSink))
+                .Distinct()
+                .Where(kvp =>
+                    !kvp.Key.Equals("TestGroup", StringComparison.OrdinalIgnoreCase)
+                    && !kvp.Value.Equals("TestGroup", StringComparison.OrdinalIgnoreCase)
+                ),
+        ];
     }
 
     private static List<KeyValuePair<string, string>> GetTraits(
diff --git a/tests/NetEvolve.Extensions.XUnit.Tests.Unit/Predefined.cs b/tests/NetEvolve.Extensions.XUnit.Tests.Unit/Predefined.cs
index 58b102bb..6fb056ac 100644
--- a/tests/NetEvolve.Extensions.XUnit.Tests.Unit/Predefined.cs
+++ b/tests/NetEvolve.Extensions.XUnit.Tests.Unit/Predefined.cs
@@ -11,7 +11,7 @@ internal static class Predefined
     public static void Init()
     {
         Verifier.DerivePathInfo(
-            (sourceFile, projectDirectory, type, method) =>
+            (__, projectDirectory, type, method) =>
             {
                 var directory = Path.Combine(projectDirectory, "..", "_snapshots", Namer.TargetFrameworkNameAndVersion);
                 _ = Directory.CreateDirectory(directory);
diff --git a/tests/NetEvolve.Extensions.XUnit.V3.Tests.PublicApi/Predefined.cs b/tests/NetEvolve.Extensions.XUnit.V3.Tests.PublicApi/Predefined.cs
index 9be9b50a..44e50817 100644
--- a/tests/NetEvolve.Extensions.XUnit.V3.Tests.PublicApi/Predefined.cs
+++ b/tests/NetEvolve.Extensions.XUnit.V3.Tests.PublicApi/Predefined.cs
@@ -11,7 +11,7 @@ internal static class Predefined
     public static void Init()
     {
         Verifier.DerivePathInfo(
-            (sourceFile, projectDirectory, type, method) =>
+            (__, projectDirectory, type, method) =>
             {
                 var directory = Path.Combine(projectDirectory, "_snapshots", Namer.TargetFrameworkNameAndVersion);
                 _ = Directory.CreateDirectory(directory);
diff --git a/tests/NetEvolve.Extensions.XUnit.V3.Tests.Unit/Predefined.cs b/tests/NetEvolve.Extensions.XUnit.V3.Tests.Unit/Predefined.cs
index 60344b8b..1649a260 100644
--- a/tests/NetEvolve.Extensions.XUnit.V3.Tests.Unit/Predefined.cs
+++ b/tests/NetEvolve.Extensions.XUnit.V3.Tests.Unit/Predefined.cs
@@ -11,7 +11,7 @@ internal static class Predefined
     public static void Init()
     {
         Verifier.DerivePathInfo(
-            (sourceFile, projectDirectory, type, method) =>
+            (__, projectDirectory, type, method) =>
             {
                 var directory = Path.Combine(projectDirectory, "..", "_snapshots", Namer.TargetFrameworkNameAndVersion);
                 _ = Directory.CreateDirectory(directory);